From 74e2669103b59d51b24ddc48f378b1d04a3effd4 Mon Sep 17 00:00:00 2001
From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu, 27 Nov 2008 04:33:44 -0200
Subject: [PATCH] Export symbols also defined in libXfont.

  libXfont has stubs for these symbols, so, when compiling with hidden
symbols by default, these symbols must be visible in the X Server, or
the stubs in libXfont will be used.
---
 dix/dixfonts.c | 20 ++++++++++----------
 dix/dixutils.c |  2 +-
 os/utils.c     |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index 416adb352..97352ba2d 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -1915,14 +1915,14 @@ InitFonts (void)
 #endif
 }
 
-int
+_X_EXPORT int
 GetDefaultPointSize ()
 {
     return 120;
 }
 
 
-FontResolutionPtr
+_X_EXPORT FontResolutionPtr
 GetClientResolutions (int *num)
 {
     static struct _FontResolution res;
@@ -1954,7 +1954,7 @@ GetClientResolutions (int *num)
  * should be called (only once!) by each type of fpe when initialized
  */
 
-int
+_X_EXPORT int
 RegisterFPEFunctions(NameCheckFunc name_func, 
 		     InitFpeFunc init_func, 
 		     FreeFpeFunc free_func, 
@@ -2020,32 +2020,32 @@ FreeFonts(void)
 
 /* convenience functions for FS interface */
 
-FontPtr
+_X_EXPORT FontPtr
 find_old_font(XID id)
 {
     return (FontPtr) SecurityLookupIDByType(NullClient, id, RT_NONE,
 					    DixUnknownAccess);
 }
 
-Font
+_X_EXPORT Font
 GetNewFontClientID()
 {
     return FakeClientID(0);
 }
 
-int
+_X_EXPORT int
 StoreFontClientFont(FontPtr pfont, Font id)
 {
     return AddResource(id, RT_NONE, (pointer) pfont);
 }
 
-void
+_X_EXPORT void
 DeleteFontClientID(Font id)
 {
     FreeResource(id, RT_NONE);
 }
 
-int
+_X_EXPORT int
 client_auth_generation(ClientPtr client)
 {
     return 0;
@@ -2054,7 +2054,7 @@ client_auth_generation(ClientPtr client)
 static int  fs_handlers_installed = 0;
 static unsigned int last_server_gen;
 
-int
+_X_EXPORT int
 init_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler)
 {
     /* if server has reset, make sure the b&w handlers are reinstalled */
@@ -2072,7 +2072,7 @@ init_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler)
     return Successful;
 }
 
-void
+_X_EXPORT void
 remove_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler, Bool all)
 {
     if (all) {
diff --git a/dix/dixutils.c b/dix/dixutils.c
index 340564ecd..1dfb34651 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -614,7 +614,7 @@ ClientSleep (ClientPtr client, ClientSleepProcPtr function, pointer closure)
     return TRUE;
 }
 
-Bool
+_X_EXPORT Bool
 ClientSignal (ClientPtr client)
 {
     SleepQueuePtr   q;
diff --git a/os/utils.c b/os/utils.c
index b1009494b..39a40e481 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -982,7 +982,7 @@ ProcessCommandLine(int argc, char *argv[])
 
 /* Implement a simple-minded font authorization scheme.  The authorization
    name is "hp-hostname-1", the contents are simply the host name. */
-int
+_X_EXPORT int
 set_font_authorizations(char **authorizations, int *authlen, pointer client)
 {
 #define AUTHORIZATION_NAME "hp-hostname-1"