From 109767a6f5b5ab932369c0324a06a2d9d12ec702 Mon Sep 17 00:00:00 2001
From: Patrik Stridvall <ps@leissner.se>
Date: Sat, 31 Jul 1999 14:38:31 +0000
Subject: [PATCH] Fixed missing prototypes and made it work with Solaris X11.

---
 tools/make_X11wrappers | 8 +++++++-
 tsx11/ts_xf86dga.c     | 2 ++
 tsx11/ts_xf86vmode.c   | 2 ++
 tsx11/ts_xlib.c        | 2 ++
 tsx11/ts_xpm.c         | 2 ++
 tsx11/ts_xresource.c   | 2 ++
 tsx11/ts_xshm.c        | 2 ++
 tsx11/ts_xutil.c       | 2 ++
 8 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/tools/make_X11wrappers b/tools/make_X11wrappers
index 05f2878542..1a8100966d 100755
--- a/tools/make_X11wrappers
+++ b/tools/make_X11wrappers
@@ -107,7 +107,9 @@ END
 
 $pre_file
 $x11_incl#include <X11/$extensions_dir$name.h>
+
 #include "debugtools.h"
+#include "ts_$lcname.h"
 #include "x11drv.h"
 
 DEFAULT_DEBUG_CHANNEL(x11)
@@ -266,7 +268,11 @@ END
 		"a0,a1,a2,a3"
 	);	
     } else {
-	open(IN, "echo \"$x11_incl#include <X11/$extensions_dir$name.h>\" | gcc -L$X11_include_dir -E - | grep -v '^[ \t]*\$'|") || die "open";
+	open(IN, 
+	     "echo \"$x11_incl#include <X11/$extensions_dir$name.h>\" | " . 
+	     "gcc -L$X11_include_dir -DNeedFunctionPrototypes -E - | " .
+	     "grep -v '^[ \t]*\$)' |"
+	     ) || die "open";
 
       PROTO: while(<IN>) {
 	  if(m'extern\s+([^()]*)\b([a-zA-Z0-9_]+)\s*\(') {
diff --git a/tsx11/ts_xf86dga.c b/tsx11/ts_xf86dga.c
index 70300225ff..c28a48fe55 100644
--- a/tsx11/ts_xf86dga.c
+++ b/tsx11/ts_xf86dga.c
@@ -12,7 +12,9 @@
 
 #include <X11/Xlib.h>
 #include <X11/extensions/xf86dga.h>
+
 #include "debugtools.h"
+#include "ts_xf86dga.h"
 #include "x11drv.h"
 
 DEFAULT_DEBUG_CHANNEL(x11)
diff --git a/tsx11/ts_xf86vmode.c b/tsx11/ts_xf86vmode.c
index 78cb208ad1..035404aee7 100644
--- a/tsx11/ts_xf86vmode.c
+++ b/tsx11/ts_xf86vmode.c
@@ -15,7 +15,9 @@
 
 #include <X11/Xlib.h>
 #include <X11/extensions/xf86vmode.h>
+
 #include "debugtools.h"
+#include "ts_xf86vmode.h"
 #include "x11drv.h"
 
 DEFAULT_DEBUG_CHANNEL(x11)
diff --git a/tsx11/ts_xlib.c b/tsx11/ts_xlib.c
index a7870fa582..1f34fb292e 100644
--- a/tsx11/ts_xlib.c
+++ b/tsx11/ts_xlib.c
@@ -10,7 +10,9 @@
 
 
 #include <X11/Xlib.h>
+
 #include "debugtools.h"
+#include "ts_xlib.h"
 #include "x11drv.h"
 
 DEFAULT_DEBUG_CHANNEL(x11)
diff --git a/tsx11/ts_xpm.c b/tsx11/ts_xpm.c
index edb8437a86..115a806062 100644
--- a/tsx11/ts_xpm.c
+++ b/tsx11/ts_xpm.c
@@ -11,7 +11,9 @@
 #ifdef HAVE_LIBXXPM
 
 #include <X11/xpm.h>
+
 #include "debugtools.h"
+#include "ts_xpm.h"
 #include "x11drv.h"
 
 DEFAULT_DEBUG_CHANNEL(x11)
diff --git a/tsx11/ts_xresource.c b/tsx11/ts_xresource.c
index 5b152d18bc..c5bbfa547d 100644
--- a/tsx11/ts_xresource.c
+++ b/tsx11/ts_xresource.c
@@ -11,7 +11,9 @@
 
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
+
 #include "debugtools.h"
+#include "ts_xresource.h"
 #include "x11drv.h"
 
 DEFAULT_DEBUG_CHANNEL(x11)
diff --git a/tsx11/ts_xshm.c b/tsx11/ts_xshm.c
index f3bf65157a..c42f37723b 100644
--- a/tsx11/ts_xshm.c
+++ b/tsx11/ts_xshm.c
@@ -12,7 +12,9 @@
 
 #include <X11/Xlib.h>
 #include <X11/extensions/XShm.h>
+
 #include "debugtools.h"
+#include "ts_xshm.h"
 #include "x11drv.h"
 
 DEFAULT_DEBUG_CHANNEL(x11)
diff --git a/tsx11/ts_xutil.c b/tsx11/ts_xutil.c
index a0039976eb..3e7bdc19c6 100644
--- a/tsx11/ts_xutil.c
+++ b/tsx11/ts_xutil.c
@@ -12,7 +12,9 @@
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
 #include <X11/Xutil.h>
+
 #include "debugtools.h"
+#include "ts_xutil.h"
 #include "x11drv.h"
 
 DEFAULT_DEBUG_CHANNEL(x11)