XBUG 7467, do the right thing for functions that need an ANSI-style declaration

when there's a prototype in scope (there is)

5 files changed, 25 insertions, 5 deletions

diff --git a/xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_io.c b/xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_io.c
index 71e9d2efc..a3bfa4dc2 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_io.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_io.c
@@ -1,4 +1,4 @@
-/* $XConsortium: am_io.c,v 1.1 94/03/28 21:27:35 dpw Exp gildea $ */
+/* $XConsortium: am_io.c,v 1.2 95/06/09 20:57:00 gildea Exp kaleb $ */
 /*
  * Copyright 1993 by Vrije Universiteit, The Netherlands
  * Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
@@ -95,8 +95,12 @@ int xf86GetKbdLeds()
 	return cur_leds;
 }
 
+#if NeedFunctionPrototypes
+void xf86SetKbdRepeat(char rad)
+#else
 void xf86SetKbdRepeat(rad)
 char rad;
+#endif
 {
 	return;
 }
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c b/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c
index 2d448a708..d31aa23a7 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c
@@ -1,4 +1,4 @@
-/* $XConsortium: bsd_io.c,v 1.3 95/01/16 13:17:58 kaleb Exp gildea $ */
+/* $XConsortium: bsd_io.c,v 1.4 95/06/09 20:57:00 gildea Exp kaleb $ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c,v 3.2 1995/01/10 10:28:47 dawes Exp $ */
 /*
  * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
@@ -128,8 +128,12 @@ int xf86GetKbdLeds()
 	return(leds);
 }
 
+#if NeedFunctionPrototypes
+void xf86SetKbdRepeat(char rad)
+#else
 void xf86SetKbdRepeat(rad)
 char rad;
+#endif
 {
 	switch (xf86Info.consType) {
 
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_io.c b/xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_io.c
index ab26b6ca8..48f03d6bc 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_io.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_io.c
@@ -1,4 +1,4 @@
-/* $XConsortium: bsdi_io.c,v 1.1 94/03/28 21:28:32 dpw Exp gildea $ */
+/* $XConsortium: bsdi_io.c,v 1.2 95/06/09 20:57:00 gildea Exp kaleb $ */
 /*
  * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
  * Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
@@ -62,8 +62,12 @@ int xf86GetKbdLeds()
 	return(0);
 }
 
+#if NeedFunctionPrototypes
+void xf86SetKbdRepeat(char rad)
+#else
 void xf86SetKbdRepeat(rad)
 char rad;
+#endif
 {
 	return;
 }
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c b/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
index 9e23941b0..d9053115f 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: lnx_io.c,v 1.1 94/03/28 21:28:56 dpw Exp kaleb $ */
 /*
  * Copyright 1992 by Orest Zborowski <obz@Kodak.com>
  * Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
@@ -64,8 +64,12 @@ int xf86GetKbdLeds()
 	return(leds);
 }
 
+#if NeedFunctionPrototypes
+void xf86SetKbdRepeat(char rad)
+#else
 void xf86SetKbdRepeat(rad)
 char rad;
+#endif
 {
 	return;
 }
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/mach/mach_io.c b/xc/programs/Xserver/hw/xfree86/os-support/mach/mach_io.c
index 9e52013c6..e57e849eb 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/mach/mach_io.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/mach/mach_io.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: mach_io.c,v 1.1 94/03/28 21:29:27 dpw Exp kaleb $ */
 /*
  * Copyright 1992 by Robert Baron <Robert.Baron@ernst.mach.cs.cmu.edu>
  * Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
@@ -111,8 +111,12 @@ int xf86GetKbdLeds()
 #endif
 }
 
+#if NeedFunctionPrototypes
+void xf86SetKbdRepeat(char rad)
+#else
 void xf86SetKbdRepeat(rad)
 char rad;
+#endif
 {
 	return;
 }