Ansification and compile warning fixes.

  Code that already have a header with the proper prototype is safe
to ansify.
  This uses XORG_CHANGELOG macro to properly work with the "git-log"
to "git log" change (required to pass "make distcheck"), uses the
XORG_CWARNFLAGS macro, and doesn't generate any compile warnings from
gcc 4.3 and sparse.

23 files changed, 33 insertions, 64 deletions

diff --git a/.gitignore b/.gitignore
index fcf7a61..d7302be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,7 @@ mkinstalldirs
 stamp-h1
 xdmcp.pc
 *~
+ChangeLog
+*.o
+libXdmcp-*.tar.*
+*.patch
diff --git a/A8Eq.c b/A8Eq.c
index b986580..d274f78 100644
--- a/A8Eq.c
+++ b/A8Eq.c
@@ -36,8 +36,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xdmcp.h>
 
 int
-XdmcpARRAY8Equal (array1, array2)
-    ARRAY8Ptr	array1, array2;
+XdmcpARRAY8Equal (ARRAY8Ptr array1, ARRAY8Ptr array2)
 {
     int	i;
 
diff --git a/CA8.c b/CA8.c
index efdd5a1..dc68c40 100644
--- a/CA8.c
+++ b/CA8.c
@@ -37,8 +37,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xfuncs.h>
 
 int
-XdmcpCopyARRAY8 (src, dst)
-    ARRAY8Ptr	src, dst;
+XdmcpCopyARRAY8 (ARRAY8Ptr src, ARRAY8Ptr dst)
 {
     dst->length = src->length;
     dst->data = (CARD8 *) Xalloc (dst->length * sizeof (CARD8));
diff --git a/DA32.c b/DA32.c
index 9d9620b..37cc99a 100644
--- a/DA32.c
+++ b/DA32.c
@@ -36,8 +36,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xdmcp.h>
 
 void
-XdmcpDisposeARRAY32 (array)
-    ARRAY32Ptr	array;
+XdmcpDisposeARRAY32 (ARRAY32Ptr array)
 {
     if (array->data != NULL) Xfree (array->data);
     array->length = 0;
diff --git a/DA8.c b/DA8.c
index 9c20690..dbcd635 100644
--- a/DA8.c
+++ b/DA8.c
@@ -36,8 +36,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xdmcp.h>
 
 void
-XdmcpDisposeARRAY8 (array)
-    ARRAY8Ptr	array;
+XdmcpDisposeARRAY8 (ARRAY8Ptr array)
 {
     if (array->data != NULL) Xfree (array->data);
     array->length = 0;
diff --git a/DAofA8.c b/DAofA8.c
index 73a2e9c..26f0a92 100644
--- a/DAofA8.c
+++ b/DAofA8.c
@@ -36,8 +36,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xdmcp.h>
 
 void
-XdmcpDisposeARRAYofARRAY8 (array)
-    ARRAYofARRAY8Ptr	array;
+XdmcpDisposeARRAYofARRAY8 (ARRAYofARRAY8Ptr array)
 {
     int	i;
 
diff --git a/Fill.c b/Fill.c
index 08f6b35..dd26d8b 100644
--- a/Fill.c
+++ b/Fill.c
@@ -55,11 +55,7 @@ in this Software without prior written authorization from The Open Group.
 #endif
 
 int
-XdmcpFill (fd, buffer, from, fromlen)
-    int		    fd;
-    XdmcpBufferPtr  buffer;
-    XdmcpNetaddr    from;	/* return */
-    int		    *fromlen;	/* return */
+XdmcpFill (int fd, XdmcpBufferPtr buffer, XdmcpNetaddr from, int *fromlen)
 {
     BYTE    *newBuf;
 #ifdef STREAMSCONN
diff --git a/Flush.c b/Flush.c
index d04cdb3..6a32e7c 100644
--- a/Flush.c
+++ b/Flush.c
@@ -55,11 +55,7 @@ in this Software without prior written authorization from The Open Group.
 #endif
 
 int
-XdmcpFlush (fd, buffer, to, tolen)
-    int		    fd;
-    XdmcpBufferPtr  buffer;
-    XdmcpNetaddr    to;
-    int		    tolen;
+XdmcpFlush (int fd, XdmcpBufferPtr buffer, XdmcpNetaddr to, int tolen)
 {
     int result;
 #ifdef STREAMSCONN
diff --git a/Makefile.am b/Makefile.am
index 14e8ed0..e419649 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,13 +80,13 @@ $(LINTLIB): $(libXdmcp_la_SOURCES) $(nodist_libXdmcp_la_SOURCES)
 	$(LINT) -y -oXdmcp -x $(ALL_LINT_FLAGS) $(libXdmcp_la_SOURCES) $(nodist_libXdmcp_la_SOURCES)
 endif MAKE_LINT_LIB
 
-if MAINTAINER_MODE
+MAINTAINERCLEANFILES=ChangeLog
+
 .PHONY: ChangeLog
 
 ChangeLog:
-	GIT_DIR=${srcdir}/.git git-log > ChangeLog
+	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
-endif MAINTAINER_MODE
 
 CLEANFILES=$(lintlib_DATA)
diff --git a/RA16.c b/RA16.c
index 0a279a4..c8ccd1a 100644
--- a/RA16.c
+++ b/RA16.c
@@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xdmcp.h>
 
 int
-XdmcpReadARRAY16 (buffer, array)
-    XdmcpBufferPtr  buffer;
-    ARRAY16Ptr	    array;
+XdmcpReadARRAY16 (XdmcpBufferPtr buffer, ARRAY16Ptr array)
 {
     int	    i;
 
diff --git a/RA32.c b/RA32.c
index 9baa285..8f6bfd3 100644
--- a/RA32.c
+++ b/RA32.c
@@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xdmcp.h>
 
 int
-XdmcpReadARRAY32 (buffer, array)
-    XdmcpBufferPtr  buffer;
-    ARRAY32Ptr	    array;
+XdmcpReadARRAY32 (XdmcpBufferPtr buffer, ARRAY32Ptr array)
 {
     int	    i;
 
diff --git a/RA8.c b/RA8.c
index 2b8b962..b447896 100644
--- a/RA8.c
+++ b/RA8.c
@@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xdmcp.h>
 
 int
-XdmcpReadARRAY8 (buffer, array)
-    XdmcpBufferPtr  buffer;
-    ARRAY8Ptr	    array;
+XdmcpReadARRAY8 (XdmcpBufferPtr buffer, ARRAY8Ptr array)
 {
     int	    i;
 
diff --git a/RAofA8.c b/RAofA8.c
index d751e99..7c8563f 100644
--- a/RAofA8.c
+++ b/RAofA8.c
@@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xdmcp.h>
 
 int
-XdmcpReadARRAYofARRAY8 (buffer, array)
-    XdmcpBufferPtr	buffer;
-    ARRAYofARRAY8Ptr	array;
+XdmcpReadARRAYofARRAY8 (XdmcpBufferPtr buffer, ARRAYofARRAY8Ptr array)
 {
     int	    i;
 
diff --git a/RC16.c b/RC16.c
index 1af69a6..cd5ec4d 100644
--- a/RC16.c
+++ b/RC16.c
@@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xdmcp.h>
 
 int
-XdmcpReadCARD16 (buffer, valuep)
-    XdmcpBufferPtr  buffer;
-    CARD16Ptr	    valuep;
+XdmcpReadCARD16 (XdmcpBufferPtr buffer, CARD16Ptr valuep)
 {
     CARD8   high, low;
 
diff --git a/RC32.c b/RC32.c
index caf19e6..99a6d35 100644
--- a/RC32.c
+++ b/RC32.c
@@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xdmcp.h>
 
 int
-XdmcpReadCARD32 (buffer, valuep)
-    XdmcpBufferPtr  buffer;
-    CARD32Ptr	    valuep;
+XdmcpReadCARD32 (XdmcpBufferPtr buffer, CARD32Ptr valuep)
 {
     CARD8   byte0, byte1, byte2, byte3;
     if (XdmcpReadCARD8 (buffer, &byte0) &&
diff --git a/RC8.c b/RC8.c
index a9cd068..4376265 100644
--- a/RC8.c
+++ b/RC8.c
@@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xdmcp.h>
 
 int
-XdmcpReadCARD8 (buffer, valuep)
-    XdmcpBufferPtr  buffer;
-    CARD8Ptr	    valuep;
+XdmcpReadCARD8 (XdmcpBufferPtr buffer, CARD8Ptr valuep)
 {
     if (buffer->pointer >= buffer->count)
 	return FALSE;
diff --git a/RHead.c b/RHead.c
index 6b0b837..a5640a5 100644
--- a/RHead.c
+++ b/RHead.c
@@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xdmcp.h>
 
 int
-XdmcpReadHeader (buffer, header)
-    XdmcpBufferPtr  buffer;
-    XdmcpHeaderPtr  header;
+XdmcpReadHeader (XdmcpBufferPtr buffer, XdmcpHeaderPtr header)
 {
     if (XdmcpReadCARD16 (buffer, &header->version) &&
         XdmcpReadCARD16 (buffer, &header->opcode) &&
diff --git a/RR.c b/RR.c
index 2d7d2db..3f0c26a 100644
--- a/RR.c
+++ b/RR.c
@@ -36,8 +36,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xdmcp.h>
 
 int
-XdmcpReadRemaining (buffer)
-    XdmcpBufferPtr  buffer;
+XdmcpReadRemaining (XdmcpBufferPtr  buffer)
 {
     return buffer->count - buffer->pointer;
 }
diff --git a/WA16.c b/WA16.c
index 4551161..8ad307b 100644
--- a/WA16.c
+++ b/WA16.c
@@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xdmcp.h>
 
 int
-XdmcpWriteARRAY16 (buffer, array)
-    XdmcpBufferPtr  buffer;
-    ARRAY16Ptr	    array;
+XdmcpWriteARRAY16 (XdmcpBufferPtr buffer, ARRAY16Ptr array)
 {
     int	i;
 
diff --git a/WA32.c b/WA32.c
index 8d61b1e..b58ad25 100644
--- a/WA32.c
+++ b/WA32.c
@@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xdmcp.h>
 
 int
-XdmcpWriteARRAY32 (buffer, array)
-    XdmcpBufferPtr  buffer;
-    ARRAY32Ptr	    array;
+XdmcpWriteARRAY32 (XdmcpBufferPtr buffer, ARRAY32Ptr array)
 {
     int	i;
 
diff --git a/WA8.c b/WA8.c
index 43443c9..336d747 100644
--- a/WA8.c
+++ b/WA8.c
@@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xdmcp.h>
 
 int
-XdmcpWriteARRAY8 (buffer, array)
-    XdmcpBufferPtr  buffer;
-    ARRAY8Ptr	    array;
+XdmcpWriteARRAY8 (XdmcpBufferPtr buffer, ARRAY8Ptr array)
 {
     int	i;
 
diff --git a/WAofA8.c b/WAofA8.c
index 69f7bd0..d50f3a6 100644
--- a/WAofA8.c
+++ b/WAofA8.c
@@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xdmcp.h>
 
 int
-XdmcpWriteARRAYofARRAY8 (buffer, array)
-    XdmcpBufferPtr	buffer;
-    ARRAYofARRAY8Ptr	array;
+XdmcpWriteARRAYofARRAY8 (XdmcpBufferPtr buffer, ARRAYofARRAY8Ptr array)
 {
     int	i;
 
diff --git a/configure.ac b/configure.ac
index 88d8754..4d8f502 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,9 +30,9 @@ AM_MAINTAINER_MODE
 
 AM_CONFIG_HEADER(config.h)
 
-# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.1)
+# Require xorg-macros: XORG_WITH_LINT, XORG_CWARNFLAGS, XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2.1 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2.1)
 
 AC_PROG_CC
 AC_PROG_INSTALL
@@ -46,6 +46,8 @@ AC_CHECK_FUNCS([srand48 lrand48])
 AC_SEARCH_LIBS([recvfrom],[socket])
 
 PKG_CHECK_MODULES(XDMCP, xproto)
+XORG_CWARNFLAGS
+XDMCP_CFLAGS="$CWARNFLAGS $XDMCP_CFLAGS"
 AC_SUBST(XDMCP_CFLAGS)
 AC_SUBST(XDMCP_LIBS)
 
@@ -63,6 +65,7 @@ XORG_WITH_LINT
 XORG_LINT_LIBRARY([Xdmcp])
 
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile
            xdmcp.pc])