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

Side by Side Diff: third_party/freetype/include/freetype/config/ftconfig.h

Issue 1413673003: Update bundled freetype to 2.6.1 (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: DEPS for corpus Created 5 years, 1 month 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 /***************************************************************************/ 1 /***************************************************************************/
2 /* */ 2 /* */
3 /* ftconfig.h */ 3 /* ftconfig.h */
4 /* */ 4 /* */
5 /* ANSI-specific configuration file (specification only). */ 5 /* ANSI-specific configuration file (specification only). */
6 /* */ 6 /* */
7 /* Copyright 1996-2004, 2006-2008, 2010-2011, 2013, 2014 by */ 7 /* Copyright 1996-2015 by */
8 /* David Turner, Robert Wilhelm, and Werner Lemberg. */ 8 /* David Turner, Robert Wilhelm, and Werner Lemberg. */
9 /* */ 9 /* */
10 /* This file is part of the FreeType project, and may only be used, */ 10 /* This file is part of the FreeType project, and may only be used, */
11 /* modified, and distributed under the terms of the FreeType project */ 11 /* modified, and distributed under the terms of the FreeType project */
12 /* license, LICENSE.TXT. By continuing to use, modify, or distribute */ 12 /* license, LICENSE.TXT. By continuing to use, modify, or distribute */
13 /* this file you indicate that you have read the license and */ 13 /* this file you indicate that you have read the license and */
14 /* understand and accept it fully. */ 14 /* understand and accept it fully. */
15 /* */ 15 /* */
16 /***************************************************************************/ 16 /***************************************************************************/
17 17
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 #endif /* _MSC_VER */ 312 #endif /* _MSC_VER */
313 313
314 #endif /* FT_SIZEOF_LONG == (64 / FT_CHAR_BIT) */ 314 #endif /* FT_SIZEOF_LONG == (64 / FT_CHAR_BIT) */
315 315
316 #ifdef FT_LONG64 316 #ifdef FT_LONG64
317 typedef FT_INT64 FT_Int64; 317 typedef FT_INT64 FT_Int64;
318 typedef FT_UINT64 FT_UInt64; 318 typedef FT_UINT64 FT_UInt64;
319 #endif 319 #endif
320 320
321 321
322 /*************************************************************************/
323 /* */
324 /* miscellaneous */
325 /* */
326 /*************************************************************************/
327
328
322 #define FT_BEGIN_STMNT do { 329 #define FT_BEGIN_STMNT do {
323 #define FT_END_STMNT } while ( 0 ) 330 #define FT_END_STMNT } while ( 0 )
324 #define FT_DUMMY_STMNT FT_BEGIN_STMNT FT_END_STMNT 331 #define FT_DUMMY_STMNT FT_BEGIN_STMNT FT_END_STMNT
325 332
326 333
334 /* typeof condition taken from gnulib's `intprops.h' header file */
335 #if ( __GNUC__ >= 2 || \
336 defined( __IBM__TYPEOF__ ) || \
337 ( __SUNPRO_C >= 0x5110 && !__STDC__ ) )
338 #define FT_TYPEOF( type ) (__typeof__ (type))
339 #else
340 #define FT_TYPEOF( type ) /* empty */
341 #endif
342
343
327 #ifdef FT_MAKE_OPTION_SINGLE_OBJECT 344 #ifdef FT_MAKE_OPTION_SINGLE_OBJECT
328 345
329 #define FT_LOCAL( x ) static x 346 #define FT_LOCAL( x ) static x
330 #define FT_LOCAL_DEF( x ) static x 347 #define FT_LOCAL_DEF( x ) static x
331 348
332 #else 349 #else
333 350
334 #ifdef __cplusplus 351 #ifdef __cplusplus
335 #define FT_LOCAL( x ) extern "C" x 352 #define FT_LOCAL( x ) extern "C" x
336 #define FT_LOCAL_DEF( x ) extern "C" x 353 #define FT_LOCAL_DEF( x ) extern "C" x
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 #endif /* FT_CALLBACK_TABLE */ 458 #endif /* FT_CALLBACK_TABLE */
442 459
443 460
444 FT_END_HEADER 461 FT_END_HEADER
445 462
446 463
447 #endif /* __FTCONFIG_H__ */ 464 #endif /* __FTCONFIG_H__ */
448 465
449 466
450 /* END */ 467 /* END */
OLDNEW
« no previous file with comments | « third_party/freetype/include/freetype.h ('k') | third_party/freetype/include/freetype/config/ftheader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698