dix: fix redundant redeclaration warnings in dixfont

These functions are already declared in <X11/fonts/fontproto.h>.
Redeclaring them just for _X_EXPORT causes tons of warnings throughout
xserver, but they need to be declared somewhere to be picked up by
sdksyms.sh.  Doing so in a private header limits the warnings to
sdksyms.c; fixing those as well would require changes to fontsproto.

Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Yaakov Selkowitz 2012-10-16 14:06:30 -05:00
commit 1aa783754e
5 changed files with 57 additions and 39 deletions

View file

@ -1823,12 +1823,14 @@ InitFonts(void)
register_fpe_functions();
}
_X_EXPORT
int
GetDefaultPointSize(void)
{
return 120;
}
_X_EXPORT
FontResolutionPtr
GetClientResolutions(int *num)
{
@ -1861,6 +1863,7 @@ GetClientResolutions(int *num)
* should be called (only once!) by each type of fpe when initialized
*/
_X_EXPORT
int
RegisterFPEFunctions(NameCheckFunc name_func,
InitFpeFunc init_func,
@ -1932,24 +1935,28 @@ find_old_font(XID id)
return (FontPtr) pFont;
}
_X_EXPORT
Font
GetNewFontClientID(void)
{
return FakeClientID(0);
}
_X_EXPORT
int
StoreFontClientFont(FontPtr pfont, Font id)
{
return AddResource(id, RT_NONE, (pointer) pfont);
}
_X_EXPORT
void
DeleteFontClientID(Font id)
{
FreeResource(id, RT_NONE);
}
_X_EXPORT
int
client_auth_generation(ClientPtr client)
{
@ -1959,6 +1966,7 @@ client_auth_generation(ClientPtr client)
static int fs_handlers_installed = 0;
static unsigned int last_server_gen;
_X_EXPORT
int
init_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler)
{
@ -1977,6 +1985,7 @@ init_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler)
return Successful;
}
_X_EXPORT
void
remove_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler,
Bool all)