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

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

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
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 */ 4 /* Manually added template defines */
5 #define FC_CACHEDIR "@FC_CACHEDIR@" 5 #define FC_CACHEDIR "@FC_CACHEDIR@"
6 #define FONTCONFIG_PATH "@FONTCONFIG_PATH@" 6 #define FONTCONFIG_PATH "@FONTCONFIG_PATH@"
7 7
8 /* Define if building universal (internal helper macro) */ 8 /* Define if building universal (internal helper macro) */
9 /* #undef AC_APPLE_UNIVERSAL_BUILD */ 9 /* #undef AC_APPLE_UNIVERSAL_BUILD */
10 10
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 146
147 /* Define to 1 if you have the `regexec' function. */ 147 /* Define to 1 if you have the `regexec' function. */
148 #define HAVE_REGEXEC 1 148 #define HAVE_REGEXEC 1
149 149
150 /* Define to 1 if you have the <regex.h> header file. */ 150 /* Define to 1 if you have the <regex.h> header file. */
151 #define HAVE_REGEX_H 1 151 #define HAVE_REGEX_H 1
152 152
153 /* Define to 1 if you have the `regfree' function. */ 153 /* Define to 1 if you have the `regfree' function. */
154 #define HAVE_REGFREE 1 154 #define HAVE_REGFREE 1
155 155
156 /* Define to 1 if you have the 'scandir' function. */
157 #define HAVE_SCANDIR 1
158
159 /* Define to 1 if you have the 'scandir' function with int (* compar)(const
160 void *, const void *) */
161 /* #undef HAVE_SCANDIR_VOID_P */
162
156 /* Define to 1 if you have the <sched.h> header file. */ 163 /* Define to 1 if you have the <sched.h> header file. */
157 /* #undef HAVE_SCHED_H */ 164 /* #undef HAVE_SCHED_H */
158 165
159 /* Have sched_yield */ 166 /* Have sched_yield */
160 /* #undef HAVE_SCHED_YIELD */ 167 /* #undef HAVE_SCHED_YIELD */
161 168
162 /* Have Solaris __machine_*_barrier and atomic_* operations */ 169 /* Have Solaris __machine_*_barrier and atomic_* operations */
163 /* #undef HAVE_SOLARIS_ATOMIC_OPS */ 170 /* #undef HAVE_SOLARIS_ATOMIC_OPS */
164 171
165 /* Define to 1 if you have the <stdint.h> header file. */ 172 /* Define to 1 if you have the <stdint.h> header file. */
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 /* #undef HAVE__MKTEMP_S */ 241 /* #undef HAVE__MKTEMP_S */
235 242
236 /* Define to the sub-directory in which libtool stores uninstalled libraries. 243 /* Define to the sub-directory in which libtool stores uninstalled libraries.
237 */ 244 */
238 #define LT_OBJDIR ".libs/" 245 #define LT_OBJDIR ".libs/"
239 246
240 /* Name of package */ 247 /* Name of package */
241 #define PACKAGE "fontconfig" 248 #define PACKAGE "fontconfig"
242 249
243 /* Define to the address where bug reports for this package should be sent. */ 250 /* Define to the address where bug reports for this package should be sent. */
244 #define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enger_bug.cgi?product=fo ntconfig" 251 #define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=fo ntconfig"
245 252
246 /* Define to the full name of this package. */ 253 /* Define to the full name of this package. */
247 #define PACKAGE_NAME "fontconfig" 254 #define PACKAGE_NAME "fontconfig"
248 255
249 /* Define to the full name and version of this package. */ 256 /* Define to the full name and version of this package. */
250 #define PACKAGE_STRING "fontconfig 2.10.93" 257 #define PACKAGE_STRING "fontconfig 2.11.0"
251 258
252 /* Define to the one symbol short name of this package. */ 259 /* Define to the one symbol short name of this package. */
253 #define PACKAGE_TARNAME "fontconfig" 260 #define PACKAGE_TARNAME "fontconfig"
254 261
255 /* Define to the home page for this package. */ 262 /* Define to the home page for this package. */
256 #define PACKAGE_URL "" 263 #define PACKAGE_URL ""
257 264
258 /* Define to the version of this package. */ 265 /* Define to the version of this package. */
259 #define PACKAGE_VERSION "2.10.93" 266 #define PACKAGE_VERSION "2.11.0"
260 267
261 /* Define to necessary symbol if this constant uses a non-standard name on 268 /* Define to necessary symbol if this constant uses a non-standard name on
262 your system. */ 269 your system. */
263 /* #undef PTHREAD_CREATE_JOINABLE */ 270 /* #undef PTHREAD_CREATE_JOINABLE */
264 271
265 /* The size of `char', as computed by sizeof. */ 272 /* The size of `char', as computed by sizeof. */
266 /* #undef SIZEOF_CHAR */ 273 /* #undef SIZEOF_CHAR */
267 274
268 /* The size of `int', as computed by sizeof. */ 275 /* The size of `int', as computed by sizeof. */
269 /* #undef SIZEOF_INT */ 276 /* #undef SIZEOF_INT */
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 #ifndef _TANDEM_SOURCE 312 #ifndef _TANDEM_SOURCE
306 # define _TANDEM_SOURCE 1 313 # define _TANDEM_SOURCE 1
307 #endif 314 #endif
308 /* Enable general extensions on Solaris. */ 315 /* Enable general extensions on Solaris. */
309 #ifndef __EXTENSIONS__ 316 #ifndef __EXTENSIONS__
310 # define __EXTENSIONS__ 1 317 # define __EXTENSIONS__ 1
311 #endif 318 #endif
312 319
313 320
314 /* Version number of package */ 321 /* Version number of package */
315 #define VERSION "2.10.93" 322 #define VERSION "2.11.0"
316 323
317 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most 324 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
318 significant byte first (like Motorola and SPARC, unlike Intel). */ 325 significant byte first (like Motorola and SPARC, unlike Intel). */
319 #if defined AC_APPLE_UNIVERSAL_BUILD 326 #if defined AC_APPLE_UNIVERSAL_BUILD
320 # if defined __BIG_ENDIAN__ 327 # if defined __BIG_ENDIAN__
321 # define WORDS_BIGENDIAN 1 328 # define WORDS_BIGENDIAN 1
322 # endif 329 # endif
323 #else 330 #else
324 # ifndef WORDS_BIGENDIAN 331 # ifndef WORDS_BIGENDIAN
325 /* # undef WORDS_BIGENDIAN */ 332 /* # undef WORDS_BIGENDIAN */
(...skipping 27 matching lines...) Expand all
353 /* Define to `__inline__' or `__inline' if that's what the C compiler 360 /* Define to `__inline__' or `__inline' if that's what the C compiler
354 calls it, or to nothing if 'inline' is not supported under any name. */ 361 calls it, or to nothing if 'inline' is not supported under any name. */
355 #ifndef __cplusplus 362 #ifndef __cplusplus
356 /* #undef inline */ 363 /* #undef inline */
357 #endif 364 #endif
358 365
359 /* Define to `int' if <sys/types.h> does not define. */ 366 /* Define to `int' if <sys/types.h> does not define. */
360 /* #undef pid_t */ 367 /* #undef pid_t */
361 368
362 #include "config-fixups.h" 369 #include "config-fixups.h"
OLDNEW
« no previous file with comments | « third_party/fontconfig/config/fc-lang/fclang.h ('k') | third_party/fontconfig/config/mac/fcstdint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698