Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1082)

Side by Side Diff: third_party/fontconfig/config/mac/config.h.template

Issue 132333002: Fix Mac fontconfig build (try 2) (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: comments Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « third_party/fontconfig/config/mac/config.h ('k') | third_party/fontconfig/process-template.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* config.h. Generated from config.h.in by configure. */ 1 /* config.h. Generated from config.h.in by configure. */
2 /* config.h.in. Generated from configure.ac by autoheader. */ 2 /* config.h.in. Generated from configure.ac by autoheader. */
3 3
4 /* Manually added template defines */
5 #define FC_CACHEDIR "@FC_CACHEDIR@"
6 #define FONTCONFIG_PATH "@FONTCONFIG_PATH@"
7
4 /* Define if building universal (internal helper macro) */ 8 /* Define if building universal (internal helper macro) */
5 /* #undef AC_APPLE_UNIVERSAL_BUILD */ 9 /* #undef AC_APPLE_UNIVERSAL_BUILD */
6 10
7 /* The normal alignment of `double', in bytes. */ 11 /* The normal alignment of `double', in bytes. */
8 #define ALIGNOF_DOUBLE 8 12 #define ALIGNOF_DOUBLE 8
9 13
10 /* Use libxml2 instead of Expat */ 14 /* Use libxml2 instead of Expat */
11 /* #undef ENABLE_LIBXML2 */ 15 /* #undef ENABLE_LIBXML2 */
12 16
13 /* Additional font directories */ 17 /* Additional font directories */
14 #define FC_ADD_FONTS "yes" 18 #define FC_ADD_FONTS "/System/Library/Fonts,/Library/Fonts"
15 19
16 /* Architecture prefix to use for cache file names */ 20 /* Architecture prefix to use for cache file names */
17 /* #undef FC_ARCHITECTURE */ 21 /* #undef FC_ARCHITECTURE */
18 22
19 /* System font directory */ 23 /* System font directory */
20 #define FC_DEFAULT_FONTS "/usr/share/fonts" 24 #define FC_DEFAULT_FONTS "/usr/share/fonts"
21 25
22 /* Define to nothing if C supports flexible array members, and to 1 if it does 26 /* Define to nothing if C supports flexible array members, and to 1 if it does
23 not. That way, with a declaration like `struct s { int n; double 27 not. That way, with a declaration like `struct s { int n; double
24 d[FLEXIBLE_ARRAY_MEMBER]; };', the struct hack can be used with pre-C99 28 d[FLEXIBLE_ARRAY_MEMBER]; };', the struct hack can be used with pre-C99
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 /* Define to `__inline__' or `__inline' if that's what the C compiler 353 /* Define to `__inline__' or `__inline' if that's what the C compiler
350 calls it, or to nothing if 'inline' is not supported under any name. */ 354 calls it, or to nothing if 'inline' is not supported under any name. */
351 #ifndef __cplusplus 355 #ifndef __cplusplus
352 /* #undef inline */ 356 /* #undef inline */
353 #endif 357 #endif
354 358
355 /* Define to `int' if <sys/types.h> does not define. */ 359 /* Define to `int' if <sys/types.h> does not define. */
356 /* #undef pid_t */ 360 /* #undef pid_t */
357 361
358 #include "config-fixups.h" 362 #include "config-fixups.h"
OLDNEW
« no previous file with comments | « third_party/fontconfig/config/mac/config.h ('k') | third_party/fontconfig/process-template.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698