From: Pierre Ossman <ossman@cendio.se>
Date: Thu, 29 Jan 2015 09:16:49 +0000 (+0100)
Subject: Use proper prototypes in headers for all our internal functions
X-Git-Tag: v1.4.90~63
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5a3c39a9a08312879dddc4042f04029fce58ce26;p=tigervnc.git

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 db9bf660..88fa68e1 100644
--- 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 630d67df..8a3a2735 100644
--- 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 abca48d4..05ca7ba9 100644
--- 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 b8988131..54e09cb5 100644
--- 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 051f6b44..5dcf875d 100644
--- 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 3498d0f3..26d8b40f 100644
--- 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];