Index: src/psnames/pspic.h |
diff --git a/src/psnames/pspic.h b/src/psnames/pspic.h |
index 1169b89f0c82e3b3840761b9017da17fd27e7715..6ff002c6037bfa299fe89ed0cb1fdd6e9016027a 100644 |
--- a/src/psnames/pspic.h |
+++ b/src/psnames/pspic.h |
@@ -4,7 +4,7 @@ |
/* */ |
/* The FreeType position independent code services for psnames module. */ |
/* */ |
-/* Copyright 2009 by */ |
+/* Copyright 2009, 2012 by */ |
/* Oran Agra and Mickey Gabel. */ |
/* */ |
/* This file is part of the FreeType project, and may only be used, */ |
@@ -25,22 +25,27 @@ FT_BEGIN_HEADER |
#include FT_INTERNAL_PIC_H |
#ifndef FT_CONFIG_OPTION_PIC |
-#define FT_PSCMAPS_SERVICES_GET pscmaps_services |
-#define FT_PSCMAPS_INTERFACE_GET pscmaps_interface |
+ |
+#define PSCMAPS_SERVICES_GET pscmaps_services |
+#define PSCMAPS_INTERFACE_GET pscmaps_interface |
#else /* FT_CONFIG_OPTION_PIC */ |
#include FT_SERVICE_POSTSCRIPT_CMAPS_H |
- typedef struct PSModulePIC_ |
+ typedef struct PSModulePIC_ |
{ |
- FT_ServiceDescRec* pscmaps_services; |
- FT_Service_PsCMapsRec pscmaps_interface; |
+ FT_ServiceDescRec* pscmaps_services; |
+ FT_Service_PsCMapsRec pscmaps_interface; |
+ |
} PSModulePIC; |
-#define GET_PIC(lib) ((PSModulePIC*)((lib)->pic_container.psnames)) |
-#define FT_PSCMAPS_SERVICES_GET (GET_PIC(library)->pscmaps_services) |
-#define FT_PSCMAPS_INTERFACE_GET (GET_PIC(library)->pscmaps_interface) |
+ |
+#define GET_PIC( lib ) \ |
+ ( (PSModulePIC*)((lib)->pic_container.psnames) ) |
+#define PSCMAPS_SERVICES_GET ( GET_PIC( library )->pscmaps_services ) |
+#define PSCMAPS_INTERFACE_GET ( GET_PIC( library )->pscmaps_interface ) |
+ |
/* see pspic.c for the implementation */ |
void |