summaryrefslogtreecommitdiff
path: root/xc/include/DPS/PSres.h
diff options
context:
space:
mode:
authoralanh <alanh>2000-07-10 20:43:21 +0000
committeralanh <alanh>2000-07-10 20:43:21 +0000
commit55378d1c9953642fb1b327237d51287d4d8beefb (patch)
tree9fa410ce1172ee263503c9bc22b33eac2db1833e /xc/include/DPS/PSres.h
parent4a947efe3394fe82c2a6c97a033e5065567c55ea (diff)
Import of XFree86 4.0.1
Diffstat (limited to 'xc/include/DPS/PSres.h')
-rw-r--r--xc/include/DPS/PSres.h24
1 files changed, 6 insertions, 18 deletions
diff --git a/xc/include/DPS/PSres.h b/xc/include/DPS/PSres.h
index 41f74e1b0..887fff621 100644
--- a/xc/include/DPS/PSres.h
+++ b/xc/include/DPS/PSres.h
@@ -35,6 +35,10 @@
*
* Author: Adobe Systems Incorporated
*/
+/* $XFree86: xc/include/DPS/PSres.h,v 1.2 2000/06/07 22:02:55 tsi Exp $ */
+
+#ifndef _PSres_h
+#define _PSres_h
extern char *PSResFontOutline, *PSResFontPrebuilt, *PSResFontAFM,
*PSResFontBDF, *PSResFontFamily, *PSResFontBDFSizes,
@@ -43,22 +47,6 @@ extern char *PSResFontOutline, *PSResFontPrebuilt, *PSResFontAFM,
typedef enum {PSSaveReturnValues, PSSaveByType, PSSaveEverything}
PSResourceSavePolicy;
-#ifdef _NO_PROTO
-
-extern int ListPSResourceFiles();
-extern int ListPSResourceTypes();
-extern void FreePSResourceStorage();
-extern void SetPSResourcePolicy();
-typedef int (*PSResourceEnumerator)();
-extern void EnumeratePSResourceFiles();
-extern int CheckPSResourceTime();
-typedef char *(*PSResMallocProc)();
-typedef char *(*PSResReallocProc)();
-typedef void (*PSResFreeProc)();
-typedef void (*PSResFileWarningHandlerProc)();
-
-#else /* _NO_PROTO */
-
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
#endif
@@ -108,8 +96,6 @@ typedef void (*PSResFileWarningHandlerProc)(char *fileNamem, char *extraInfo);
}
#endif
-#endif /* _NO_PROTO */
-
extern PSResMallocProc PSResMalloc;
extern PSResReallocProc PSResRealloc;
@@ -117,3 +103,5 @@ extern PSResReallocProc PSResRealloc;
extern PSResFreeProc PSResFree;
extern PSResFileWarningHandlerProc PSResFileWarningHandler;
+
+#endif /* _PSres_h */