Use proper prototypes in headers for all our internal functions

diff --git a/unix/xserver/hw/vnc/Input.c b/unix/xserver/hw/vnc/Input.c
index db9bf660813992c6ad0091d217c0441070ca2d1e..88fa68e1ecc60ea30976c7ccb403f8792dce6566 100644 (file)
--- a/unix/xserver/hw/vnc/Input.c
+++ b/unix/xserver/hw/vnc/Input.c
@@ -26,6 +26,7 @@
 
 #include "Input.h"
 #include "vncExtInit.h"
+#include "RFBGlue.h"
 
 #include "inputstr.h"
 #if XORG >= 110

diff --git a/unix/xserver/hw/vnc/XorgGlue.c b/unix/xserver/hw/vnc/XorgGlue.c
index 630d67df46af0c6ca0fe93f044c7e4bd7db14e99..8a3a2735dcebe6bb74474f9e393b41385e8dd288 100644 (file)
--- a/unix/xserver/hw/vnc/XorgGlue.c
+++ b/unix/xserver/hw/vnc/XorgGlue.c
@@ -30,10 +30,6 @@
 
 #include "XorgGlue.h"
 
-#ifdef RANDR
-extern RRModePtr vncRandRModeGet(int width, int height);
-#endif
-
 const char *vncGetDisplay(void)
 {
   return display;

diff --git a/unix/xserver/hw/vnc/XorgGlue.h b/unix/xserver/hw/vnc/XorgGlue.h
index abca48d4ec876196000b0b65df4cb0f61540180a..05ca7ba997d00737865336627140ae142d71ddf8 100644 (file)
--- a/unix/xserver/hw/vnc/XorgGlue.h
+++ b/unix/xserver/hw/vnc/XorgGlue.h
@@ -57,7 +57,9 @@ intptr_t vncRandRGetOutputId(int scrIdx, int outputIdx);
 void vncRandRGetOutputDimensions(int scrIdx, int outputIdx,
                                  int *x, int *y, int *width, int *height);
 
-// This one hides in xvnc.c or vncModule.c
+// These hide in xvnc.c or vncModule.c
+void vncClientGone(int fd);
+void *vncRandRModeGet(int width, int height);
 int vncRandRCreateOutputs(int scrIdx, int extraOutputs);
 
 #ifdef __cplusplus

diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc
index b89881311c3d30af5855dd8ae07cb1e53f635a4e..54e09cb57cc3ed262a043c1b19c384757cbfb45e 100644 (file)
--- a/unix/xserver/hw/vnc/XserverDesktop.cc
+++ b/unix/xserver/hw/vnc/XserverDesktop.cc
@@ -46,9 +46,6 @@
 #include "XorgGlue.h"
 #include "Input.h"
 
-// Hack to catch when inetd has let us go
-extern "C" void vncClientGone(int fd);
-
 using namespace rfb;
 using namespace network;
 

diff --git a/unix/xserver/hw/vnc/vncModule.c b/unix/xserver/hw/vnc/vncModule.c
index 051f6b44a3085ef992c97290ad39795d5f8e12e2..5dcf875d02938ccf493f69b32f7218b206c33e8f 100644 (file)
--- a/unix/xserver/hw/vnc/vncModule.c
+++ b/unix/xserver/hw/vnc/vncModule.c
@@ -35,6 +35,7 @@
 
 #include "vncExtInit.h"
 #include "RFBGlue.h"
+#include "XorgGlue.h"
 
 static void vncModuleInit(INITARGS);
 
@@ -103,8 +104,12 @@ static void vncModuleInit(INITARGS)
   vncExtensionInit();
 }
 
+void vncClientGone(int fd)
+{
+}
+
 #ifdef RANDR
-RRModePtr vncRandRModeGet(int width, int height)
+void *vncRandRModeGet(int width, int height)
 {
     return NULL;
 }

diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c
index 3498d0f372554bb1804b2d3b7d7380a5a0525f7d..26d8b40f79096458915661a3236c891a4aafc799 100644 (file)
--- a/unix/xserver/hw/vnc/xvnc.c
+++ b/unix/xserver/hw/vnc/xvnc.c
@@ -34,6 +34,7 @@ from the X Consortium.
 
 #include "vncExtInit.h"
 #include "RFBGlue.h"
+#include "XorgGlue.h"
 #include "xorg-version.h"
 
 #ifdef WIN32
@@ -1053,7 +1054,6 @@ xf86SetRootClip (ScreenPtr pScreen, Bool enable)
     FlushAllOutput ();
 }
 
-RRModePtr vncRandRModeGet(int width, int height);
 static Bool vncRandRCrtcSet(ScreenPtr pScreen, RRCrtcPtr crtc, RRModePtr mode,
                             int x, int y, Rotation rotation, int num_outputs,
                             RROutputPtr *outputs);
@@ -1234,8 +1234,8 @@ static const int vncRandRHeights[] = { 1200, 1080, 1200, 1050, 1050,  768, 1024,
 
 static int vncRandRIndex = 0;
 
-/* This is a global symbol since XserverDesktop also uses it */
-RRModePtr vncRandRModeGet(int width, int height)
+/* This is a global symbol since findRandRMode() also uses it */
+void *vncRandRModeGet(int width, int height)
 {
     xRRModeInfo        modeInfo;
     char name[100];