[PATCH 2/4] Fix redundant declarations in dixfont.h

[Jon TURNEY]

../include/dixfont.h:149:12: warning: redundant redeclaration of 'client_auth_generation' [-Wredundant-decls]
/install/include/X11/fonts/fontproto.h:52:12: note: previous declaration of 'client_auth_generation' was here
../include/dixfont.h:151:13: warning: redundant redeclaration of 'DeleteFontClientID' [-Wredundant-decls]
/install/include/X11/fonts/fontproto.h:59:13: note: previous declaration of 'DeleteFontClientID' was here
../include/dixfont.h:153:26: warning: redundant redeclaration of 'GetClientResolutions' [-Wredundant-decls]
/install/include/X11/fonts/font.h:147:26: note: previous declaration of 'GetClientResolutions' was here
../include/dixfont.h:155:12: warning: redundant redeclaration of 'GetDefaultPointSize' [-Wredundant-decls]
/install/include/X11/fonts/fontproto.h:44:12: note: previous declaration of 'GetDefaultPointSize' was here
../include/dixfont.h:157:13: warning: redundant redeclaration of 'GetNewFontClientID' [-Wredundant-decls]
/install/include/X11/fonts/fontproto.h:60:13: note: previous declaration of 'GetNewFontClientID' was here
../include/dixfont.h:159:12: warning: redundant redeclaration of 'init_fs_handlers' [-Wredundant-decls]
/install/include/X11/fonts/fontproto.h:46:12: note: previous declaration of 'init_fs_handlers' was here
../include/dixfont.h:162:12: warning: redundant redeclaration of 'RegisterFPEFunctions' [-Wredundant-decls]
/install/include/X11/fonts/fontproto.h:28:12: note: previous declaration of 'RegisterFPEFunctions' was here
../include/dixfont.h:178:13: warning: redundant redeclaration of 'remove_fs_handlers' [-Wredundant-decls]
/install/include/X11/fonts/fontproto.h:48:13: note: previous declaration of 'remove_fs_handlers' was here
../include/dixfont.h:182:12: warning: redundant redeclaration of 'StoreFontClientFont' [-Wredundant-decls]
/install/include/X11/fonts/fontproto.h:61:12: note: previous declaration of 'StoreFontClientFont' was here

These functions (which are required by libXfont) are prototyped in fontproto.h, which is included
(indirectly, at the moment) by dixfont.h.  It seems sensible to remove the declarations from dixfonts.h
and make the include explicit

Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
---
 include/dixfont.h |   39 +--------------------------------------
 1 files changed, 1 insertions(+), 38 deletions(-)

diff --git a/include/dixfont.h b/include/dixfont.h
index 617b94a..d607e6c 100644
--- a/include/dixfont.h
+++ b/include/dixfont.h
@@ -28,6 +28,7 @@ SOFTWARE.
 #include <X11/fonts/font.h>
 #include "closure.h"
 #include <X11/fonts/fontstruct.h>
+#include <X11/fonts/fontproto.h>
 
 #define NullDIXFontProp ((DIXFontPropPtr)0)
 
@@ -143,42 +144,4 @@ extern _X_EXPORT void SetGlyphCachingMode(int /*newmode*/);
 
 extern _X_EXPORT void register_fpe_functions(void);
 
-/*
- * libXfont stubs.
- */
-extern _X_EXPORT int client_auth_generation(ClientPtr client);
-
-extern _X_EXPORT void DeleteFontClientID(Font id);
-
-extern _X_EXPORT FontResolutionPtr GetClientResolutions(int *num);
-
-extern _X_EXPORT int GetDefaultPointSize(void);
-
-extern _X_EXPORT Font GetNewFontClientID(void);
-
-extern _X_EXPORT int init_fs_handlers(FontPathElementPtr fpe,
-				      BlockHandlerProcPtr block_handler);
-
-extern _X_EXPORT int RegisterFPEFunctions(NameCheckFunc name_func,
-					  InitFpeFunc init_func,
-					  FreeFpeFunc free_func,
-					  ResetFpeFunc reset_func,
-					  OpenFontFunc open_func,
-					  CloseFontFunc close_func,
-					  ListFontsFunc list_func,
-					  StartLfwiFunc start_lfwi_func,
-					  NextLfwiFunc next_lfwi_func,
-					  WakeupFpeFunc wakeup_func,
-					  ClientDiedFunc client_died,
-					  LoadGlyphsFunc load_glyphs,
-					  StartLaFunc start_list_alias_func,
-					  NextLaFunc next_list_alias_func,
-					  SetPathFunc set_path_func);
-
-extern _X_EXPORT void remove_fs_handlers(FontPathElementPtr fpe,
-					 BlockHandlerProcPtr blockHandler,
-					 Bool all);
-
-extern _X_EXPORT int StoreFontClientFont(FontPtr pfont, Font id);
-
 #endif				/* DIXFONT_H */
-- 
1.7.5.1