Chiebot-Mirror
/
freetype
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added #ifdef's for C++ to all header files.

Browse Source
VER-2-0-4-PATCH
Werner Lemberg 25 years ago
parent 2366de2542
commit a74e4c0dac
40 changed files with 407 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      builds/unix/ftconfig.in
  2. 10
      include/freetype/config/ftconfig.h
  3. 10
      include/freetype/config/ftoption.h
  4. 10
      include/freetype/fterrors.h
  5. 10
      include/freetype/ftmac.h
  6. 10
      include/freetype/ftnames.h
  7. 10
      include/freetype/ftsystem.h
  8. 10
      include/freetype/fttypes.h
  9. 10
      include/freetype/internal/autohint.h
  10. 10
      include/freetype/internal/ftdriver.h
  11. 10
      include/freetype/internal/ftmemory.h
  12. 10
      include/freetype/internal/psnames.h
  13. 10
      include/freetype/internal/sfnt.h
  14. 10
      include/freetype/internal/t1errors.h
  15. 10
      include/freetype/internal/t1types.h
  16. 10
      include/freetype/internal/t2errors.h
  17. 10
      include/freetype/internal/t2types.h
  18. 10
      include/freetype/internal/tterrors.h
  19. 10
      include/freetype/internal/tttypes.h
  20. 10
      include/freetype/t1tables.h
  21. 10
      include/freetype/ttnameid.h
  22. 10
      include/freetype/tttags.h
  23. 10
      src/autohint/ahangles.h
  24. 10
      src/autohint/ahglobal.h
  25. 10
      src/autohint/ahglyph.h
  26. 10
      src/autohint/ahhint.h
  27. 11
      src/autohint/ahloader.h
  28. 11
      src/autohint/ahmodule.h
  29. 10
      src/autohint/ahoptim.h
  30. 10
      src/autohint/ahtypes.h
  31. 10
      src/cff/t2driver.h
  32. 10
      src/cid/cidriver.h
  33. 11
      src/psnames/psmodule.h
  34. 11
      src/raster1/ftrend1.h
  35. 11
      src/sfnt/sfdriver.h
  36. 11
      src/smooth/ftsmooth.h
  37. 10
      src/truetype/ttdriver.h
  38. 10
      src/type1/t1driver.h
  39. 10
      src/type1z/z1driver.h
  40. 10
      src/winfonts/winfnt.h

11
builds/unix/ftconfig.in
Unescape View File

@ -42,6 +42,11 @@
#include <freetype/config/ftoption.h>
#ifdef __cplusplus
extern "C" {
#endif
/*************************************************************************/
/* */
/* PLATFORM-SPECIFIC CONFIGURATION MACROS */
@ -166,6 +171,12 @@
#define FT_EXPORT_VAR( x ) extern x
#endif
#ifdef __cplusplus
}
#endif
#endif /* FTCONFIG_H */

10
include/freetype/config/ftconfig.h
Unescape View File

@ -44,6 +44,11 @@
#include <freetype/config/ftoption.h>
#ifdef __cplusplus
extern "C" {
#endif
/*************************************************************************/
/* */
/* PLATFORM-SPECIFIC CONFIGURATION MACROS */
@ -181,6 +186,11 @@
#define FT_EXPORT_VAR( x ) extern x
#endif
#ifdef __cplusplus
}
#endif
#endif /* FTCONFIG_H */

10
include/freetype/config/ftoption.h
Unescape View File

@ -20,6 +20,11 @@
#define FTOPTION_H
#ifdef __cplusplus
extern "C" {
#endif
/*************************************************************************/
/* */
/* USER-SELECTABLE CONFIGURATION MACROS */
@ -389,6 +394,11 @@
#undef T1_CONFIG_OPTION_NO_MM_SUPPORT
#ifdef __cplusplus
}
#endif
#endif /* FTOPTION_H */

10
include/freetype/fterrors.h
Unescape View File

@ -44,6 +44,11 @@
#define FTERRORS_H
#ifdef __cplusplus
extern "C" {
#endif
#ifndef FT_ERRORDEF
#define FT_ERRORDEF( e, v, s ) e = v,
@ -160,6 +165,11 @@
#undef FT_ERRORDEF
#ifdef __cplusplus
}
#endif
#endif /* FTERRORS_H */

10
include/freetype/ftmac.h
Unescape View File

@ -25,6 +25,11 @@
#define FT_MAC_H
#ifdef __cplusplus
extern "C" {
#endif
/*************************************************************************/
/* */
/* <Function> */
@ -61,4 +66,9 @@
FT_Face* aface );
#ifdef __cplusplus
}
#endif
#endif /* FT_MAC_H */

10
include/freetype/ftnames.h
Unescape View File

@ -26,6 +26,11 @@
#include <freetype/freetype.h>
#ifdef __cplusplus
extern "C" {
#endif
typedef struct FT_SfntName_
{
FT_UShort platform_id;
@ -46,6 +51,11 @@
FT_SfntName* aname );
#ifdef __cplusplus
}
#endif
#endif /* FTNAMES_H */

10
include/freetype/ftsystem.h
Unescape View File

@ -20,6 +20,11 @@
#define FTSYSTEM_H
#ifdef __cplusplus
extern "C" {
#endif
/*************************************************************************/
/* */
/* M E M O R Y M A N A G E M E N T */
@ -95,6 +100,11 @@
};
#ifdef __cplusplus
}
#endif
#endif /* FTSYSTEM_H */

10
include/freetype/fttypes.h
Unescape View File

@ -24,6 +24,11 @@
#include <freetype/ftimage.h>
#ifdef __cplusplus
extern "C" {
#endif
/*************************************************************************/
/* */
/* <Type> */
@ -394,6 +399,11 @@
#define FT_IS_EMPTY( list ) ( (list).head == 0 )
#ifdef __cplusplus
}
#endif
#endif /* FTTYPES_H */

10
include/freetype/internal/autohint.h
Unescape View File

@ -73,6 +73,11 @@
#include <freetype/freetype.h>
#ifdef __cplusplus
extern "C" {
#endif
typedef struct FT_AutoHinterRec_ *FT_AutoHinter;
@ -189,6 +194,11 @@
} FT_AutoHinter_Interface;
#ifdef __cplusplus
}
#endif
#endif /* AUTOHINT_H */

10
include/freetype/internal/ftdriver.h
Unescape View File

@ -24,6 +24,11 @@
#include <freetype/config/ftconfig.h>
#ifdef __cplusplus
extern "C" {
#endif
typedef FT_Error (*FTDriver_initFace)( FT_Stream stream,
FT_Face face,
FT_Int typeface_index,
@ -176,6 +181,11 @@
} FT_Driver_Class;
#ifdef __cplusplus
}
#endif
#endif /* FTDRIVER_H */

10
include/freetype/internal/ftmemory.h
Unescape View File

@ -24,6 +24,11 @@
#include <freetype/fttypes.h>
#ifdef __cplusplus
extern "C" {
#endif
/*************************************************************************/
/* */
/* <Macro> */
@ -121,6 +126,11 @@
#define FREE( _pointer_ ) FT_Free( memory, (void**)&(_pointer_) )
#ifdef __cplusplus
}
#endif
#endif /* FTMEMORY_H */

10
include/freetype/internal/psnames.h
Unescape View File

@ -24,6 +24,11 @@
#include <freetype/freetype.h>
#ifdef __cplusplus
extern "C" {
#endif
/*************************************************************************/
/* */
/* <FuncType> */
@ -214,6 +219,11 @@
} PSNames_Interface;
#ifdef __cplusplus
}
#endif
#endif /* PSNAMES_H */

10
include/freetype/internal/sfnt.h
Unescape View File

@ -25,6 +25,11 @@
#include <freetype/internal/tttypes.h>
#ifdef __cplusplus
extern "C" {
#endif
/*************************************************************************/
/* */
/* <FuncType> */
@ -486,6 +491,11 @@
} SFNT_Interface;
#ifdef __cplusplus
}
#endif
#endif /* SFNT_H */

10
include/freetype/internal/t1errors.h
Unescape View File

@ -20,6 +20,11 @@
#define T1ERRORS_H
#ifdef __cplusplus
extern "C" {
#endif
/************************ error codes declaration **************/
/* The error codes are grouped into `classes' used to indicate the */
@ -61,6 +66,11 @@
#define T1_Err_Stack_Overflow FT_Err_Invalid_File_Format
#ifdef __cplusplus
}
#endif
#endif /* T1ERRORS_H */

10
include/freetype/internal/t1types.h
Unescape View File

@ -25,6 +25,11 @@
#include <freetype/internal/psnames.h>
#ifdef __cplusplus
extern "C" {
#endif
/*************************************************************************/
/*************************************************************************/
/*************************************************************************/
@ -182,6 +187,11 @@
} CID_FaceRec;
#ifdef __cplusplus
}
#endif
#endif /* T1TYPES_H */

10
include/freetype/internal/t2errors.h
Unescape View File

@ -20,6 +20,11 @@
#define T2ERRORS_H
#ifdef __cplusplus
extern "C" {
#endif
/*************************************************************************/
/* */
/* Error codes declaration */
@ -115,6 +120,11 @@
#define T2_Err_Could_Not_Find_Context 0x550
#ifdef __cplusplus
}
#endif
#endif /* T2ERRORS_H */

10
include/freetype/internal/t2types.h
Unescape View File

@ -24,6 +24,11 @@
#include <freetype/freetype.h>
#ifdef __cplusplus
extern "C" {
#endif
/*************************************************************************/
/* */
/* <Struct> */
@ -212,6 +217,11 @@
} CFF_Font;
#ifdef __cplusplus
}
#endif
#endif /* T2TYPES_H */

10
include/freetype/internal/tterrors.h
Unescape View File

@ -20,6 +20,11 @@
#define TTERRORS_H
#ifdef __cplusplus
extern "C" {
#endif
/*************************************************************************/
/* */
/* Error codes declaration */
@ -115,6 +120,11 @@
#define TT_Err_Could_Not_Find_Context 0x450
#ifdef __cplusplus
}
#endif
#endif /* TTERRORS_H */

10
include/freetype/internal/tttypes.h
Unescape View File

@ -24,6 +24,11 @@
#include <freetype/tttables.h>
#ifdef __cplusplus
extern "C" {
#endif
/*************************************************************************/
/*************************************************************************/
/*************************************************************************/
@ -1576,6 +1581,11 @@
};
#ifdef __cplusplus
}
#endif
#endif /* TTTYPES_H */

10
include/freetype/t1tables.h
Unescape View File

@ -24,6 +24,11 @@
#include <freetype/freetype.h>
#ifdef __cplusplus
extern "C" {
#endif
/* Note that we separate font data in T1_FontInfo and T1_Private */
/* structures in order to support Multiple Master fonts. */
@ -229,6 +234,11 @@
} CID_Info;
#ifdef __cplusplus
}
#endif
#endif /* T1TABLES_H */

10
include/freetype/ttnameid.h
Unescape View File

@ -20,6 +20,11 @@
#define TTNAMEID_H
#ifdef __cplusplus
extern "C" {
#endif
/*************************************************************************/
/* */
/* Possible values for the `platform' identifier code in the name */
@ -692,6 +697,11 @@
#endif /* !HAVE_LIMIT_ON_IDENTS */
#ifdef __cplusplus
}
#endif
#endif /* TTNAMEID_H */

10
include/freetype/tttags.h
Unescape View File

@ -23,6 +23,11 @@
#include <freetype/freetype.h> /* for MAKE_TT_TAG() */
#ifdef __cplusplus
extern "C" {
#endif
#define TTAG_cmap FT_MAKE_TAG( 'c', 'm', 'a', 'p' )
#define TTAG_cvt FT_MAKE_TAG( 'c', 'v', 't', ' ' )
#define TTAG_CFF FT_MAKE_TAG( 'C', 'F', 'F', ' ' )
@ -60,6 +65,11 @@
#define TTAG_vhea FT_MAKE_TAG( 'v', 'h', 'e', 'a' )
#define TTAG_vmtx FT_MAKE_TAG( 'v', 'm', 't', 'x' )
#ifdef __cplusplus
}
#endif
#endif /* TTAGS_H */

10
src/autohint/ahangles.h
Unescape View File

@ -38,6 +38,11 @@
#include <freetype/internal/ftobjs.h>
#ifdef __cplusplus
extern "C" {
#endif
/* PI expressed in ah_angles -- we don't really need an important */
/* precision, so 256 should be enough */
#define AH_PI 256
@ -57,6 +62,11 @@
AH_Angle ah_angle( FT_Vector* v );
#ifdef __cplusplus
}
#endif
#endif /* AHANGLES_H */

10
src/autohint/ahglobal.h
Unescape View File

@ -37,6 +37,11 @@
#include <freetype/internal/ftobjs.h> /* for LOCAL_DEF/LOCAL_FUNC */
#ifdef __cplusplus
extern "C" {
#endif
#define AH_IS_TOP_BLUE( b ) ( (b) == ah_blue_capital_top || \
(b) == ah_blue_small_top )
@ -46,6 +51,11 @@
FT_Error ah_hinter_compute_globals( AH_Hinter* hinter );
#ifdef __cplusplus
}
#endif
#endif /* AHGLOBAL_H */

10
src/autohint/ahglyph.h
Unescape View File

@ -34,6 +34,11 @@
#endif
#ifdef __cplusplus
extern "C" {
#endif
typedef enum AH_UV_
{
ah_uv_fxy,
@ -87,6 +92,11 @@
void ah_outline_done( AH_Outline* outline );
#ifdef __cplusplus
}
#endif
#endif /* AHGLYPH_H */

10
src/autohint/ahhint.h
Unescape View File

@ -34,6 +34,11 @@
#endif
#ifdef __cplusplus
extern "C" {
#endif
#define AH_HINT_DEFAULT 0
#define AH_HINT_NO_ALIGNMENT 1
#define AH_HINT_NO_HORZ_EDGES 0x20000L
@ -66,6 +71,11 @@
void* global_hints );
#ifdef __cplusplus
}
#endif
#endif /* AHHINT_H */

11
src/autohint/ahloader.h
Unescape View File

@ -36,6 +36,11 @@
#define AHLOADER_H
#ifdef __cplusplus
extern "C" {
#endif
#ifdef _STANDALONE_
typedef struct AH_GlyphLoad_
@ -118,6 +123,12 @@
#endif /* _STANDALONE_ */
#ifdef __cplusplus
}
#endif
#endif /* AHLOADER_H */

11
src/autohint/ahmodule.h
Unescape View File

@ -24,8 +24,19 @@
#include <freetype/ftmodule.h>
#ifdef __cplusplus
extern "C" {
#endif
FT_EXPORT_VAR( const FT_Module_Class ) autohint_module_class;
#ifdef __cplusplus
}
#endif
#endif /* AHMODULE_H */

10
src/autohint/ahoptim.h
Unescape View File

@ -34,6 +34,11 @@
#endif
#ifdef __cplusplus
extern "C" {
#endif
/* the maximal number of stem configurations to record */
/* during optimization */
#define AH_MAX_CONFIGS 8
@ -130,6 +135,11 @@
void AH_Optimizer_Done( AH_Optimizer* optimizer );
#ifdef __cplusplus
}
#endif
#endif /* AHOPTIM_H */

10
src/autohint/ahtypes.h
Unescape View File

@ -54,6 +54,11 @@
#endif
#ifdef __cplusplus
extern "C" {
#endif
/*************************************************************************/
/*************************************************************************/
/*************************************************************************/
@ -486,6 +491,11 @@
} AH_Hinter;
#ifdef __cplusplus
}
#endif
#endif /* AHTYPES_H */

10
src/cff/t2driver.h
Unescape View File

@ -21,9 +21,19 @@
#include <freetype/internal/ftdriver.h>
#ifdef __cplusplus
extern "C" {
#endif
FT_EXPORT_VAR( const FT_Driver_Class ) cff_driver_class;
#ifdef __cplusplus
}
#endif
#endif /* T2DRIVER_H */

10
src/cid/cidriver.h
Unescape View File

@ -21,8 +21,18 @@
#include <freetype/internal/ftdriver.h>
#ifdef __cplusplus
extern "C" {
#endif
FT_EXPORT_VAR( const FT_Driver_Class ) t1cid_driver_class;
#ifdef __cplusplus
}
#endif
#endif /* CIDRIVER_H */

11
src/psnames/psmodule.h
Unescape View File

@ -21,8 +21,19 @@
#include <freetype/ftmodule.h>
#ifdef __cplusplus
extern "C" {
#endif
FT_EXPORT_VAR( const FT_Module_Class ) psnames_module_class;
#ifdef __cplusplus
}
#endif
#endif /* PSDRIVER_H */

11
src/raster1/ftrend1.h
Unescape View File

@ -19,9 +19,15 @@
#ifndef FTREND1_H
#define FTREND1_H
#include <freetype/ftrender.h>
#ifdef __cplusplus
extern "C" {
#endif
FT_EXPORT_VAR( const FT_Renderer_Class ) ft_raster1_renderer_class;
/* this renderer is _NOT_ part of the default modules, you'll need */
@ -31,6 +37,11 @@
FT_EXPORT_VAR( const FT_Renderer_Class ) ft_raster5_renderer_class;
#ifdef __cplusplus
}
#endif
#endif /* FTREND1_H */

11
src/sfnt/sfdriver.h
Unescape View File

@ -21,8 +21,19 @@
#include <freetype/ftmodule.h>
#ifdef __cplusplus
extern "C" {
#endif
FT_EXPORT_VAR( const FT_Module_Class ) sfnt_module_class;
#ifdef __cplusplus
}
#endif
#endif /* SFDRIVER_H */

11
src/smooth/ftsmooth.h
Unescape View File

@ -21,6 +21,12 @@
#include <freetype/ftrender.h>
#ifdef __cplusplus
extern "C" {
#endif
#ifndef FT_CONFIG_OPTION_NO_STD_RASTER
FT_EXPORT_VAR( const FT_Renderer_Class ) ft_std_renderer_class;
#endif
@ -29,6 +35,11 @@
FT_EXPORT_VAR( const FT_Renderer_Class ) ft_smooth_renderer_class;
#endif
#ifdef __cplusplus
}
#endif
#endif /* FTSMOOTH_H */

10
src/truetype/ttdriver.h
Unescape View File

@ -22,9 +22,19 @@
#include <freetype/internal/ftdriver.h>
#ifdef __cplusplus
extern "C" {
#endif
FT_EXPORT_VAR( const FT_Driver_Class ) tt_driver_class;
#ifdef __cplusplus
}
#endif
#endif /* TTDRIVER_H */

10
src/type1/t1driver.h
Unescape View File

@ -21,9 +21,19 @@
#include <freetype/internal/ftdriver.h>
#ifdef __cplusplus
extern "C" {
#endif
FT_EXPORT_VAR( const FT_Driver_Class ) t1_driver_class;
#ifdef __cplusplus
}
#endif
#endif /* T1DRIVER_H */

10
src/type1z/z1driver.h
Unescape View File

@ -21,8 +21,18 @@
#include <freetype/internal/ftdriver.h>
#ifdef __cplusplus
extern "C" {
#endif
FT_EXPORT_VAR( const FT_Driver_Class ) t1_driver_class;
#ifdef __cplusplus
}
#endif
#endif /* Z1DRIVER_H */

10
src/winfonts/winfnt.h
Unescape View File

@ -22,6 +22,11 @@
#include <freetype/internal/ftdriver.h>
#ifdef __cplusplus
extern "C" {
#endif
typedef struct WinMZ_Header_
{
FT_UShort magic;
@ -144,6 +149,11 @@
FT_EXPORT_VAR( const FT_Driver_Class ) winfnt_driver_class;
#ifdef __cplusplus
}
#endif
#endif /* WINFNT_H */

Write Preview
Loading…
Cancel
Save