summaryrefslogtreecommitdiff
path: root/fontproto.h
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2015-02-07 11:36:08 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2015-02-07 11:50:29 -0800
commitf900146aa6d6b67ad5e15436201ce81a874a29a7 (patch)
tree90409b0cc24a2658d790e40d8a0979fa3752407c /fontproto.h
parentdf8c05f7c0253a36589d96efa52938215eff9d4d (diff)
Explictly mark as _X_EXPORT functions that callers must export to libXfont
Fixes Solaris Studio errors building xserver with -xldscope=hidden: "dixfonts.c", line 1840: redeclaration must have the same or more restrictive linker scoping: GetDefaultPointSize "dixfonts.c", line 1847: redeclaration must have the same or more restrictive linker scoping: GetClientResolutions "dixfonts.c", line 1893: redeclaration must have the same or more restrictive linker scoping: RegisterFPEFunctions "dixfonts.c", line 1952: redeclaration must have the same or more restrictive linker scoping: GetNewFontClientID "dixfonts.c", line 1959: redeclaration must have the same or more restrictive linker scoping: StoreFontClientFont "dixfonts.c", line 1966: redeclaration must have the same or more restrictive linker scoping: DeleteFontClientID "dixfonts.c", line 1973: redeclaration must have the same or more restrictive linker scoping: client_auth_generation "dixfonts.c", line 1983: redeclaration must have the same or more restrictive linker scoping: init_fs_handlers "dixfonts.c", line 2003: redeclaration must have the same or more restrictive linker scoping: remove_fs_handlers Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'fontproto.h')
-rw-r--r--fontproto.h29
1 files changed, 16 insertions, 13 deletions
diff --git a/fontproto.h b/fontproto.h
index 490629e..ca341da 100644
--- a/fontproto.h
+++ b/fontproto.h
@@ -23,9 +23,12 @@ authorization from The XFree86 Project Inc..
#ifndef _FONTPROTO_H
#define _FONTPROTO_H
+#include <X11/Xfuncproto.h>
+
/* Externally provided functions required by libXfont */
-extern int RegisterFPEFunctions ( NameCheckFunc name_func,
+extern _X_EXPORT int RegisterFPEFunctions (
+ NameCheckFunc name_func,
InitFpeFunc init_func,
FreeFpeFunc free_func,
ResetFpeFunc reset_func,
@@ -41,26 +44,26 @@ extern int RegisterFPEFunctions ( NameCheckFunc name_func,
NextLaFunc next_list_alias_func,
SetPathFunc set_path_func);
-extern int GetDefaultPointSize ( void );
+extern _X_EXPORT int GetDefaultPointSize ( void );
-extern int init_fs_handlers ( FontPathElementPtr fpe,
- BlockHandlerProcPtr block_handler);
-extern void remove_fs_handlers ( FontPathElementPtr fpe,
- BlockHandlerProcPtr block_handler,
- Bool all );
+extern _X_EXPORT int init_fs_handlers ( FontPathElementPtr fpe,
+ BlockHandlerProcPtr block_handler);
+extern _X_EXPORT void remove_fs_handlers ( FontPathElementPtr fpe,
+ BlockHandlerProcPtr block_handler,
+ Bool all );
-extern int client_auth_generation ( ClientPtr client );
+extern _X_EXPORT int client_auth_generation ( ClientPtr client );
#ifndef ___CLIENTSIGNAL_DEFINED___
#define ___CLIENTSIGNAL_DEFINED___
extern Bool ClientSignal ( ClientPtr client );
#endif /* ___CLIENTSIGNAL_DEFINED___ */
-extern void DeleteFontClientID ( Font id );
-extern Font GetNewFontClientID ( void );
-extern int StoreFontClientFont ( FontPtr pfont, Font id );
-extern void FontFileRegisterFpeFunctions ( void );
-extern void FontFileCheckRegisterFpeFunctions ( void );
+extern _X_EXPORT void DeleteFontClientID ( Font id );
+extern _X_EXPORT Font GetNewFontClientID ( void );
+extern _X_EXPORT int StoreFontClientFont ( FontPtr pfont, Font id );
+extern _X_EXPORT void FontFileRegisterFpeFunctions ( void );
+extern _X_EXPORT void FontFileCheckRegisterFpeFunctions ( void );
extern Bool XpClientIsBitmapClient ( ClientPtr client );
extern Bool XpClientIsPrintClient( ClientPtr client, FontPathElementPtr fpe );