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.
This commit is contained in:
Paulo Cesar Pereira de Andrade 2008-11-27 04:33:44 -02:00
parent 87a7fb7438
commit 74e2669103
3 changed files with 12 additions and 12 deletions

View File

@ -1915,14 +1915,14 @@ InitFonts (void)
#endif #endif
} }
int _X_EXPORT int
GetDefaultPointSize () GetDefaultPointSize ()
{ {
return 120; return 120;
} }
FontResolutionPtr _X_EXPORT FontResolutionPtr
GetClientResolutions (int *num) GetClientResolutions (int *num)
{ {
static struct _FontResolution res; static struct _FontResolution res;
@ -1954,7 +1954,7 @@ GetClientResolutions (int *num)
* should be called (only once!) by each type of fpe when initialized * should be called (only once!) by each type of fpe when initialized
*/ */
int _X_EXPORT int
RegisterFPEFunctions(NameCheckFunc name_func, RegisterFPEFunctions(NameCheckFunc name_func,
InitFpeFunc init_func, InitFpeFunc init_func,
FreeFpeFunc free_func, FreeFpeFunc free_func,
@ -2020,32 +2020,32 @@ FreeFonts(void)
/* convenience functions for FS interface */ /* convenience functions for FS interface */
FontPtr _X_EXPORT FontPtr
find_old_font(XID id) find_old_font(XID id)
{ {
return (FontPtr) SecurityLookupIDByType(NullClient, id, RT_NONE, return (FontPtr) SecurityLookupIDByType(NullClient, id, RT_NONE,
DixUnknownAccess); DixUnknownAccess);
} }
Font _X_EXPORT Font
GetNewFontClientID() GetNewFontClientID()
{ {
return FakeClientID(0); return FakeClientID(0);
} }
int _X_EXPORT int
StoreFontClientFont(FontPtr pfont, Font id) StoreFontClientFont(FontPtr pfont, Font id)
{ {
return AddResource(id, RT_NONE, (pointer) pfont); return AddResource(id, RT_NONE, (pointer) pfont);
} }
void _X_EXPORT void
DeleteFontClientID(Font id) DeleteFontClientID(Font id)
{ {
FreeResource(id, RT_NONE); FreeResource(id, RT_NONE);
} }
int _X_EXPORT int
client_auth_generation(ClientPtr client) client_auth_generation(ClientPtr client)
{ {
return 0; return 0;
@ -2054,7 +2054,7 @@ client_auth_generation(ClientPtr client)
static int fs_handlers_installed = 0; static int fs_handlers_installed = 0;
static unsigned int last_server_gen; static unsigned int last_server_gen;
int _X_EXPORT int
init_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler) init_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler)
{ {
/* if server has reset, make sure the b&w handlers are reinstalled */ /* 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; return Successful;
} }
void _X_EXPORT void
remove_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler, Bool all) remove_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler, Bool all)
{ {
if (all) { if (all) {

View File

@ -614,7 +614,7 @@ ClientSleep (ClientPtr client, ClientSleepProcPtr function, pointer closure)
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
ClientSignal (ClientPtr client) ClientSignal (ClientPtr client)
{ {
SleepQueuePtr q; SleepQueuePtr q;

View File

@ -982,7 +982,7 @@ ProcessCommandLine(int argc, char *argv[])
/* Implement a simple-minded font authorization scheme. The authorization /* Implement a simple-minded font authorization scheme. The authorization
name is "hp-hostname-1", the contents are simply the host name. */ 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) set_font_authorizations(char **authorizations, int *authlen, pointer client)
{ {
#define AUTHORIZATION_NAME "hp-hostname-1" #define AUTHORIZATION_NAME "hp-hostname-1"