walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor

This commit is contained in:
Behdad Esfahbod 2011-09-16 16:40:44 -04:00
parent 652d64aa8d
commit 5ddd9cc499
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hb-private.hh
View File

@ -29,7 +29,7 @@
#ifndef HB_PRIVATE_HH #ifndef HB_PRIVATE_HH
#define HB_PRIVATE_HH #define HB_PRIVATE_HH
#if HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif

4
src/hb-unicode-private.hh
View File

@ -90,10 +90,10 @@ struct _hb_unicode_funcs_t {
}; };
#if HAVE_GLIB #ifdef HAVE_GLIB
extern HB_INTERNAL hb_unicode_funcs_t _hb_glib_unicode_funcs; extern HB_INTERNAL hb_unicode_funcs_t _hb_glib_unicode_funcs;
#define _hb_unicode_funcs_default _hb_glib_unicode_funcs #define _hb_unicode_funcs_default _hb_glib_unicode_funcs
#elif HAVE_ICU #elif defined(HAVE_ICU)
extern HB_INTERNAL hb_unicode_funcs_t _hb_icu_unicode_funcs; extern HB_INTERNAL hb_unicode_funcs_t _hb_icu_unicode_funcs;
#define _hb_unicode_funcs_default _hb_icu_unicode_funcs #define _hb_unicode_funcs_default _hb_icu_unicode_funcs
#else #else

4
src/test.cc
View File

@ -24,7 +24,7 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#if HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
@ -93,7 +93,7 @@ main (int argc, char **argv)
hb_font_t *font = hb_font_create (face); hb_font_t *font = hb_font_create (face);
hb_font_set_scale (font, upem, upem); hb_font_set_scale (font, upem, upem);
#if HAVE_FREETYPE #ifdef HAVE_FREETYPE
hb_ft_font_set_funcs (font); hb_ft_font_set_funcs (font);
#endif #endif

2
util/common.hh
View File

@ -41,7 +41,7 @@
#include <locale.h> #include <locale.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#if HAVE_IO_H #ifdef HAVE_IO_H
#include <io.h> /* for _setmode() under Windows */ #include <io.h> /* for _setmode() under Windows */
#endif #endif

8
util/options.cc
View File

@ -26,7 +26,7 @@
#include "options.hh" #include "options.hh"
#if HAVE_FREETYPE #ifdef HAVE_FREETYPE
#include <hb-ft.h> #include <hb-ft.h>
#endif #endif
@ -439,7 +439,7 @@ font_options_t::get_font (void) const
/* read it */ /* read it */
GString *gs = g_string_new (NULL); GString *gs = g_string_new (NULL);
char buf[BUFSIZ]; char buf[BUFSIZ];
#if HAVE_IO_H #ifdef HAVE_IO_H
_setmode (fileno (stdin), O_BINARY); _setmode (fileno (stdin), O_BINARY);
#endif #endif
while (!feof (stdin)) { while (!feof (stdin)) {
@ -498,7 +498,7 @@ font_options_t::get_font (void) const
hb_font_set_scale (font, upem, upem); hb_font_set_scale (font, upem, upem);
hb_face_destroy (face); hb_face_destroy (face);
#if HAVE_FREETYPE #ifdef HAVE_FREETYPE
hb_ft_font_set_funcs (font); hb_ft_font_set_funcs (font);
#endif #endif
@ -579,7 +579,7 @@ output_options_t::get_file_handle (void)
if (output_file) if (output_file)
fp = fopen (output_file, "wb"); fp = fopen (output_file, "wb");
else { else {
#if HAVE_IO_H #ifdef HAVE_IO_H
_setmode (fileno (stdout), O_BINARY); _setmode (fileno (stdout), O_BINARY);
#endif #endif
fp = stdout; fp = stdout;