From fd2931c0ed7f0b4d126b142106e7a7197f43e4e3 Mon Sep 17 00:00:00 2001
From: dscho <dscho>
Date: Tue, 23 Apr 2002 11:20:47 +0000
Subject: [PATCH] OSXvnc-server compile fixes

---
 Makefile | 9 ++++++---
 mac.c    | 6 ++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 2f0a16a..61e75c2 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,10 @@ INCLUDES=-I.
 VNCSERVERLIB=-L. -lvncserver -L/usr/local/lib -lz -ljpeg
 
 # for Solaris
-EXTRALIBS=-lsocket -lnsl -L/usr/X/lib
+#EXTRALIBS=-lsocket -lnsl -L/usr/X/lib
+
+# for FreeBSD
+#EXTRAINCLUDES=-I/usr/X11R6/include
 
 # Uncomment these two lines to enable use of PThreads
 #PTHREADDEF = -DHAVE_PTHREADS
@@ -14,7 +17,7 @@ FLAG24 = -DALLOW24BPP
 
 OPTFLAGS=-g -Wall
 #OPTFLAGS=-O2 -Wall
-CFLAGS=$(OPTFLAGS) $(PTHREADDEF) $(FLAG24) $(INCLUDES) -DBACKCHANNEL
+CFLAGS=$(OPTFLAGS) $(PTHREADDEF) $(FLAG24) $(INCLUDES) $(EXTRAINCLUDES) -DBACKCHANNEL
 RANLIB=ranlib
 
 LIBS=$(LDFLAGS) $(VNCSERVERLIB) $(PTHREADLIB) $(EXTRALIBS)
@@ -101,7 +104,7 @@ zippy: zippy.o libvncserver.a
 
 clean:
 	rm -f $(OBJS) *~ core "#"* *.bak *.orig storepasswd.o \
-	     	mac.o example.o pnmshow.o pnmshow24.o sratest.o \
+	     	x11vnc.o mac.o example.o pnmshow.o pnmshow24.o sratest.o \
 		blooptest.o $(OBJS)
 
 realclean: clean
diff --git a/mac.c b/mac.c
index 3cee2f2..3a43426 100644
--- a/mac.c
+++ b/mac.c
@@ -225,7 +225,7 @@ static int keyTable[] = {
 };
 
 void
-KbdAddEvent(Bool down, KeySym keySym, struct rfbClientRec* cl)
+KbdAddEvent(Bool down, KeySym keySym, struct _rfbClientRec* cl)
 {
     int i;
     CGKeyCode keyCode = -1;
@@ -349,7 +349,7 @@ void clientGone(rfbClientPtr cl)
   exit(0);
 }
 
-void newClient(rfbClientPtr cl)
+enum rfbNewClientAction newClient(rfbClientPtr cl)
 {
   if(startTime>0 && time(0)>startTime+maxSecsToConnect)
     exit(0);
@@ -358,6 +358,8 @@ void newClient(rfbClientPtr cl)
     cl->clientGoneHook = clientGone;
 
   cl->clientData=(void*)((viewOnly)?-1:0);
+
+  return(RFB_CLIENT_ACCEPT);
 }
 
 int main(int argc,char *argv[])