From 01631ec9298f135a078ff0a95d61b848d0e2c44b Mon Sep 17 00:00:00 2001
From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri, 29 Feb 2008 02:09:19 -0300
Subject: [PATCH] Ensure symbols that replace weak symbols in libraries are public.

These symbols also exist in libXfont, and "alloc" ones also exist
in libXdmcp.
---
 dix/dixfonts.c               |   22 +++++++++++-----------
 dix/dixutils.c               |    2 +-
 dix/xpstubs.c                |    4 ++--
 hw/xfree86/loader/loadfont.c |    2 +-
 hw/xprint/Init.c             |    4 ++--
 os/utils.c                   |    2 +-
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index e9a3f39..139e486 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -1921,14 +1921,14 @@ InitFonts (void)
     }
 }
 
-int
-GetDefaultPointSize ()
+_X_EXPORT int
+GetDefaultPointSize (void)
 {
     return 120;
 }
 
 
-FontResolutionPtr
+_X_EXPORT FontResolutionPtr
 GetClientResolutions (int *num)
 {
 #ifdef XPRINT
@@ -1970,7 +1970,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, 
@@ -2036,26 +2036,26 @@ 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
-GetNewFontClientID()
+_X_EXPORT Font
+GetNewFontClientID(void)
 {
     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);
@@ -2070,7 +2070,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 */
@@ -2088,7 +2088,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 aaf5106..a257a14 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -613,7 +613,7 @@ ClientSleep (ClientPtr client, ClientSleepProcPtr function, pointer closure)
     return TRUE;
 }
 
-Bool
+_X_EXPORT Bool
 ClientSignal (ClientPtr client)
 {
     SleepQueuePtr   q;
diff --git a/dix/xpstubs.c b/dix/xpstubs.c
index 59340ad..6fa5ac4 100644
--- a/dix/xpstubs.c
+++ b/dix/xpstubs.c
@@ -38,14 +38,14 @@ extern Bool XpClientIsBitmapClient(ClientPtr client);
 extern Bool XpClientIsPrintClient(ClientPtr client, FontPathElementPtr fpe);
 #endif
 
-Bool
+_X_EXPORT Bool
 XpClientIsBitmapClient(
     ClientPtr client)
 {
     return TRUE;
 }
 
-Bool
+_X_EXPORT Bool
 XpClientIsPrintClient(
     ClientPtr client,
     FontPathElementPtr fpe)
diff --git a/hw/xfree86/loader/loadfont.c b/hw/xfree86/loader/loadfont.c
index 94d31d6..e5527ac 100644
--- a/hw/xfree86/loader/loadfont.c
+++ b/hw/xfree86/loader/loadfont.c
@@ -37,7 +37,7 @@
 #include "xf86.h"
 
 /* XXX this should be static, but xorgcfg needs it, nngh */
-FontModule *FontModuleList = NULL;
+_X_EXPORT FontModule *FontModuleList = NULL;
 static int numFontModules = 0;
 
 static FontModule *
diff --git a/hw/xprint/Init.c b/hw/xprint/Init.c
index 69100d3..8df0212 100644
--- a/hw/xprint/Init.c
+++ b/hw/xprint/Init.c
@@ -1231,7 +1231,7 @@ AugmentFontPath(void)
  * case the funtion returns TRUE, indicating that the bitmap fonts 
  * should be visible to the client.
  */
-Bool
+_X_EXPORT Bool
 XpClientIsBitmapClient(
     ClientPtr client)
 {
@@ -1274,7 +1274,7 @@ XpClientIsBitmapClient(
  * directory is then compared with the directory specified in the
  * FontPathElement which is passed in.
  */
-Bool
+_X_EXPORT Bool
 XpClientIsPrintClient(
     ClientPtr client,
     FontPathElementPtr fpe)
diff --git a/os/utils.c b/os/utils.c
index 4041028..53bb0b3 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -1235,7 +1235,7 @@ ExpandCommandLine(int *pargc, char ***pargv)
 
 /* 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"
-- 
1.5.3.2