[PATCH 1/2] New header for XF86Bigfont server functions

[Yaakov (Cygwin/X)]

From: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>

Xext/xf86bigfont.c contains three non-static functions which are called
elsewhere in the server.  This creates a new header containing these
declarations in order to fix several warnings:

xf86bigfont.c:285: warning: no previous prototype for `XF86BigfontFreeFontShm'
dixfonts.c:502: warning: implicit declaration of function `XF86BigfontFreeFontShm'
dixfonts.c:502: warning: nested extern declaration of `XF86BigfontFreeFontShm'
log.c:436: warning: implicit declaration of function `XF86BigfontCleanup'
log.c:436: warning: nested extern declaration of `XF86BigfontCleanup'

Signed-off-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
---
 Xext/Makefile.am      |    2 +-
 Xext/xf86bigfont.c    |    1 +
 Xext/xf86bigfontsrv.h |   10 ++++++++++
 dix/dixfonts.c        |    3 +--
 os/log.c              |    3 +--
 5 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 Xext/xf86bigfontsrv.h

diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index 193d6e5..53cbc1f 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -107,7 +107,7 @@ MODULE_SRCS  += $(MULTIBUFFER_SRCS)
 endif
 
 # XF86 Big Font extension
-BIGFONT_SRCS = xf86bigfont.c
+BIGFONT_SRCS = xf86bigfont.c xf86bigfontsrv.h
 if XF86BIGFONT
 BUILTIN_SRCS += $(BIGFONT_SRCS)
 endif
diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c
index ce33fda..a4eb3f6 100644
--- a/Xext/xf86bigfont.c
+++ b/Xext/xf86bigfont.c
@@ -74,6 +74,7 @@
 #include "protocol-versions.h"
 
 #include <X11/extensions/xf86bigfproto.h>
+#include "xf86bigfontsrv.h"
 
 static void XF86BigfontResetProc(
     ExtensionEntry *	/* extEntry */
diff --git a/Xext/xf86bigfontsrv.h b/Xext/xf86bigfontsrv.h
new file mode 100644
index 0000000..26c2a46
--- /dev/null
+++ b/Xext/xf86bigfontsrv.h
@@ -0,0 +1,10 @@
+#ifndef _XF86BIGFONTSRV_H_
+#define _XF86BIGFONTSRV_H_
+
+#include <X11/fonts/font.h>
+
+extern void XFree86BigfontExtensionInit(void);
+extern void XF86BigfontFreeFontShm(FontPtr);
+extern void XF86BigfontCleanup(void);
+
+#endif
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index 329318d..6dc8193 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -71,8 +71,7 @@ Equipment Corporation.
 #endif
 
 #ifdef XF86BIGFONT
-#define _XF86BIGFONT_SERVER_
-#include <X11/extensions/xf86bigfont.h>
+#include "xf86bigfontsrv.h"
 #endif
 
 #define QUERYCHARINFO(pci, pr)  *(pr) = (pci)->metrics
diff --git a/os/log.c b/os/log.c
index cb8c73c..5dce2d1 100644
--- a/os/log.c
+++ b/os/log.c
@@ -99,8 +99,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #endif
 
 #ifdef XF86BIGFONT
-#define _XF86BIGFONT_SERVER_
-#include <X11/extensions/xf86bigfont.h>
+#include "xf86bigfontsrv.h"
 #endif
 
 #ifdef DDXOSVERRORF
-- 
1.6.6.1