diff options
| author | Werner Lemberg <wl@gnu.org> | 2015-07-09 15:10:31 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2015-07-09 15:10:31 +0200 |
| commit | f9be567f5f6703e68980761f54ef3d896b63185b (patch) | |
| tree | e9b1b92a7fec8dbf6ccd5beb7aeaaad8826694b1 /src/psnames | |
| parent | 1cdac10d3a03d00b1355bd47e9bfacb9f1a990e9 (diff) | |
| download | freetype2-f9be567f5f6703e68980761f54ef3d896b63185b.tar.gz | |
Better support of user-supplied C++ namespaces.
See
http://lists.nongnu.org/archive/html/freetype-devel/2015-07/msg00008.html
for a rationale.
* src/autofit/afpic.h, src/base/basepic.h, src/cff/cffpic.h,
src/pshinter/pshpic.h, src/psnames/pspic.h, src/raster/rastpic.h,
src/sfnt/sfntpic.h, src/smooth/ftspic.h, src/truetype/ttpic.h
(FT_BEGIN_HEADER, FT_END_HEADER): Move macro calls to not enclose
header files that contain FT_{BEGIN,END}_HEADER macros by
themselves.
* src/autofit/aftypes.h [FT_DEBUG_AUTOFIT]: Include
FT_CONFIG_STANDARD_LIBRARY_H earlier.
* src/truetype/ttpic.h: Include FT_INTERNL_PIC_H.
Diffstat (limited to 'src/psnames')
| -rw-r--r-- | src/psnames/pspic.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/psnames/pspic.h b/src/psnames/pspic.h index 88ccda3a5..443225af6 100644 --- a/src/psnames/pspic.h +++ b/src/psnames/pspic.h @@ -20,10 +20,9 @@ #define __PSPIC_H__ -FT_BEGIN_HEADER - #include FT_INTERNAL_PIC_H + #ifndef FT_CONFIG_OPTION_PIC #define PSCMAPS_SERVICES_GET pscmaps_services @@ -33,6 +32,9 @@ FT_BEGIN_HEADER #include FT_SERVICE_POSTSCRIPT_CMAPS_H + +FT_BEGIN_HEADER + typedef struct PSModulePIC_ { FT_ServiceDescRec* pscmaps_services; @@ -54,12 +56,12 @@ FT_BEGIN_HEADER FT_Error psnames_module_class_pic_init( FT_Library library ); +FT_END_HEADER + #endif /* FT_CONFIG_OPTION_PIC */ /* */ -FT_END_HEADER - #endif /* __PSPIC_H__ */ |