Bodge-tastic workaround some of the prototype scoping issues

xcb conversion is a good way to go, this avoids all the xlib/xserver namespace collision issues

6 files changed, 22 insertions, 2 deletions

diff --git a/hw/xwin/winauth.c b/hw/xwin/winauth.c
index 25d1fbd62..73bf83a34 100644
--- a/hw/xwin/winauth.c
+++ b/hw/xwin/winauth.c
@@ -37,6 +37,15 @@
 /* Includes for authorization */
 #include "securitysrv.h"
 
+/* Need to get this from Xlib.h */
+extern void XSetAuthorization(
+    char *                      /* name */,
+    int                         /* namelen */,
+    char *                      /* data */,
+    int                         /* datalen */
+);
+
+
 /*
  * Constants
  */
diff --git a/hw/xwin/winclipboardthread.c b/hw/xwin/winclipboardthread.c
index b5ba16f4c..e50ce9fd4 100644
--- a/hw/xwin/winclipboardthread.c
+++ b/hw/xwin/winclipboardthread.c
@@ -43,6 +43,8 @@
 #endif
 #include "misc.h"
 
+extern winSetAuthorization(void);
+
 /*
  * References to external symbols
  */
diff --git a/hw/xwin/winclipboardwndproc.c b/hw/xwin/winclipboardwndproc.c
index 077b9f0bf..49434f73d 100644
--- a/hw/xwin/winclipboardwndproc.c
+++ b/hw/xwin/winclipboardwndproc.c
@@ -38,6 +38,10 @@
 #include "winclipboard.h"
 #include "misc.h"
 
+
+extern void winFixClipboardChain(void);
+
+
 /*
  * Constants
  */
diff --git a/hw/xwin/winmultiwindowicons.h b/hw/xwin/winmultiwindowicons.h
index bf7f6eda7..5e0873ab9 100644
--- a/hw/xwin/winmultiwindowicons.h
+++ b/hw/xwin/winmultiwindowicons.h
@@ -27,8 +27,8 @@
 #ifndef WINMULTIWINDOWICONS_H
 #define WINMULTIWINDOWICONS_H
 
-void
- winUpdateIcon(HWND hWnd, Display * pDisplay, Window id, HICON hIconNew);
+//void
+// winUpdateIcon(HWND hWnd, Display * pDisplay, Window id, HICON hIconNew);
 
 void
  winInitGlobalIcons(void);
diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index 66b0c1ae4..96d5b8ae1 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -35,9 +35,11 @@
 #ifdef HAVE_XWIN_CONFIG_H
 #include <xwin-config.h>
 #endif
+
 #include "win.h"
 #include "dixevents.h"
 #include "winmultiwindowclass.h"
+#include "winmultiwindowicons.h"
 
 /*
  * Prototypes for local functions
diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c
index c17cb073a..da9a0ec37 100644
--- a/hw/xwin/winmultiwindowwm.c
+++ b/hw/xwin/winmultiwindowwm.c
@@ -64,6 +64,7 @@
 #include "pixmapstr.h"
 #include "windowstr.h"
 #include "winglobals.h"
+#include "winmultiwindowicons.h"
 
 #ifdef XWIN_MULTIWINDOWEXTWM
 #include <X11/extensions/windowswmstr.h>
@@ -80,6 +81,8 @@
 extern void winDebug(const char *format, ...);
 extern void winReshapeMultiWindow(WindowPtr pWin);
 extern void winUpdateRgnMultiWindow(WindowPtr pWin);
+extern void winUpdateIcon(HWND hWnd, Display * pDisplay, Window id, HICON hIconNew);
+extern void winSetAuthorization(void);
 
 #ifndef CYGDEBUG
 #define CYGDEBUG NO