Commit dae41e0b authored by dscho's avatar dscho

more mac

parent 5d090960
...@@ -23,7 +23,7 @@ RANLIB=ranlib ...@@ -23,7 +23,7 @@ RANLIB=ranlib
LIBS=$(LDFLAGS) $(VNCSERVERLIB) $(PTHREADLIB) $(EXTRALIBS) LIBS=$(LDFLAGS) $(VNCSERVERLIB) $(PTHREADLIB) $(EXTRALIBS)
# for Mac OS X # for Mac OS X
OSX_LIBS = -framework ApplicationServices -framework Carbon OSX_LIBS = -framework ApplicationServices -framework Carbon -framework IOKit
# for x11vnc # for x11vnc
XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXtst XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXtst
......
...@@ -211,7 +211,7 @@ rfbDimmingShutdown(void) ...@@ -211,7 +211,7 @@ rfbDimmingShutdown(void)
rfbScreenInfoPtr rfbScreen; rfbScreenInfoPtr rfbScreen;
void shutdown(rfbClientPtr cl); void rfbShutdown(rfbClientPtr cl);
/* some variables to enable special behaviour */ /* some variables to enable special behaviour */
int startTime = -1, maxSecsToConnect = 0; int startTime = -1, maxSecsToConnect = 0;
...@@ -512,7 +512,7 @@ refreshCallback(CGRectCount count, const CGRect *rectArray, void *ignore) ...@@ -512,7 +512,7 @@ refreshCallback(CGRectCount count, const CGRect *rectArray, void *ignore)
#endif #endif
if(startTime>0 && time(0)>startTime+maxSecsToConnect) if(startTime>0 && time(0)>startTime+maxSecsToConnect)
shutdown(0); rfbShutdown(0);
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
rfbMarkRectAsModified(rfbScreen, rfbMarkRectAsModified(rfbScreen,
...@@ -523,13 +523,13 @@ refreshCallback(CGRectCount count, const CGRect *rectArray, void *ignore) ...@@ -523,13 +523,13 @@ refreshCallback(CGRectCount count, const CGRect *rectArray, void *ignore)
void clientGone(rfbClientPtr cl) void clientGone(rfbClientPtr cl)
{ {
shutdown(cl); rfbShutdown(cl);
} }
enum rfbNewClientAction newClient(rfbClientPtr cl) enum rfbNewClientAction newClient(rfbClientPtr cl)
{ {
if(startTime>0 && time(0)>startTime+maxSecsToConnect) if(startTime>0 && time(0)>startTime+maxSecsToConnect)
shutdown(cl); rfbShutdown(cl);
if(disconnectAfterFirstClient) if(disconnectAfterFirstClient)
cl->clientGoneHook = clientGone; cl->clientGoneHook = clientGone;
...@@ -596,7 +596,7 @@ int main(int argc,char *argv[]) ...@@ -596,7 +596,7 @@ int main(int argc,char *argv[])
return(0); /* never ... */ return(0); /* never ... */
} }
void shutdown(rfbClientPtr cl) void rfbShutdown(rfbClientPtr cl)
{ {
rfbScreenCleanup(rfbScreen); rfbScreenCleanup(rfbScreen);
rfbDimmingShutdown(); rfbDimmingShutdown();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment