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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: third_party/fontconfig/config/windows/config.h

Issue 138843002: Roll fontconfig to 2.11.0 and reenable poppler on mac (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: support 64bit win too 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
« no previous file with comments | « third_party/fontconfig/config/mac/src/fcaliastail.h ('k') | no next file » | 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.in by autoheader. */ 2 /* config.h.in. Generated from configure.in by autoheader. */
3 3
4 #include <direct.h> 4 #include <direct.h>
5 #ifndef _S_IFDIR 5 #ifndef _S_IFDIR
6 #define _S_IFDIR 0x4000 6 #define _S_IFDIR 0x4000
7 #endif 7 #endif
8 #ifndef S_IFDIR 8 #ifndef S_IFDIR
9 #define S_IFDIR _S_IFDIR 9 #define S_IFDIR _S_IFDIR
10 #endif 10 #endif
(...skipping 14 matching lines...) Expand all
25 #ifndef F_OK 25 #ifndef F_OK
26 # define F_OK 0x00 26 # define F_OK 0x00
27 #endif 27 #endif
28 #ifndef X_OK 28 #ifndef X_OK
29 # define X_OK 0x01 29 # define X_OK 0x01
30 #endif 30 #endif
31 #ifndef W_OK 31 #ifndef W_OK
32 # define W_OK 0x02 32 # define W_OK 0x02
33 #endif 33 #endif
34 34
35 #ifdef __WIN64
36 #define SIZEOF_VOID_P 4
37 #else
38 #define SIZEOF_VOID_P 8
39 #endif
40
35 #define snprintf _snprintf 41 #define snprintf _snprintf
36 /* Font configuration directory */ 42 /* Font configuration directory */
37 #define CONFDIR "c:/windows/etc" 43 #define CONFDIR "c:/windows/etc"
38 44
39 /* Use libxml2 instead of Expat */ 45 /* Use libxml2 instead of Expat */
40 /* #undef ENABLE_LIBXML2 */ 46 /* #undef ENABLE_LIBXML2 */
41 47
42 /* Additional font directories */ 48 /* Additional font directories */
43 #define FC_ADD_FONTS "yes" 49 #define FC_ADD_FONTS "yes"
44 50
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 /* #undef const */ 234 /* #undef const */
229 235
230 /* Define to `__inline__' or `__inline' if that's what the C compiler 236 /* Define to `__inline__' or `__inline' if that's what the C compiler
231 calls it, or to nothing if 'inline' is not supported under any name. */ 237 calls it, or to nothing if 'inline' is not supported under any name. */
232 #ifndef __cplusplus 238 #ifndef __cplusplus
233 /* #undef inline */ 239 /* #undef inline */
234 #endif 240 #endif
235 241
236 /* Define to `int' if <sys/types.h> does not define. */ 242 /* Define to `int' if <sys/types.h> does not define. */
237 /* #undef pid_t */ 243 /* #undef pid_t */
OLDNEW
« no previous file with comments | « third_party/fontconfig/config/mac/src/fcaliastail.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698