Remove some useless C99-isms that cause the build to fail with GCC 2.95.

Should fix the problem exposed by kristerw@'s NetBSD 1.6.2 bulk build.

3 files changed, 45 insertions, 1 deletions

diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index 10532474570..8c713b2b7ee 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.7 2004/10/02 15:44:15 jmmv Exp $
+$NetBSD: distinfo,v 1.8 2004/11/03 11:22:58 jmmv Exp $
 
 SHA1 (libxklavier-1.04.tar.gz) = 6b909ef1320255144034a8bcdbb7cdaa15db156e
 Size (libxklavier-1.04.tar.gz) = 422337 bytes
 SHA1 (patch-aa) = 7746a3876cde51cfb08c58bd173a18520eb62d77
+SHA1 (patch-ab) = 77e692a927f80c592ecd9caed989ac24fbe9048a
+SHA1 (patch-ac) = 6fc58f67e95e6c8ea8df1e42c29493be61b9f8c1
diff --git a/x11/libxklavier/patches/patch-ab b/x11/libxklavier/patches/patch-ab
new file mode 100644
index 00000000000..8d1f3725c54
--- /dev/null
+++ b/x11/libxklavier/patches/patch-ab
@@ -0,0 +1,21 @@
+$NetBSD: patch-ab,v 1.1 2004/11/03 11:22:58 jmmv Exp $
+
+--- tests/test_config.c.orig	2004-10-01 21:52:02.000000000 +0200
++++ tests/test_config.c
+@@ -46,6 +46,7 @@ int main( int argc, char * const argv[] 
+   const char* layouts = NULL;
+   const char* options = NULL;
+   int debugLevel = 0;
++  Display* dpy;
+ 
+   while (1)
+   {
+@@ -89,7 +90,7 @@ int main( int argc, char * const argv[] 
+     exit( 0 );
+   }
+ 
+-  Display* dpy = XOpenDisplay( NULL );
++  dpy = XOpenDisplay( NULL );
+   if ( dpy == NULL )
+   {
+     fprintf( stderr, "Could not open display\n" );
diff --git a/x11/libxklavier/patches/patch-ac b/x11/libxklavier/patches/patch-ac
new file mode 100644
index 00000000000..10dac68ab5a
--- /dev/null
+++ b/x11/libxklavier/patches/patch-ac
@@ -0,0 +1,21 @@
+$NetBSD: patch-ac,v 1.1 2004/11/03 11:22:58 jmmv Exp $
+
+--- tests/test_monitor.c.orig	2004-10-01 21:52:02.000000000 +0200
++++ tests/test_monitor.c
+@@ -41,6 +41,7 @@ int main( int argc, char * argv[] )
+ {
+   int c;
+   int debugLevel = 0;
++  Display* dpy;
+   XkbEvent ev;
+ 
+   while (1)
+@@ -63,7 +64,7 @@ int main( int argc, char * argv[] )
+     }
+   }
+ 
+-  Display* dpy = XOpenDisplay( NULL );
++  dpy = XOpenDisplay( NULL );
+   if ( dpy == NULL )
+   {
+     fprintf( stderr, "Could not open display\n" );