From 25697e82162be3ebd449ba0eaca61e26916ee95d Mon Sep 17 00:00:00 2001 From: dscho Date: Sat, 29 Sep 2001 13:07:53 +0000 Subject: [PATCH] cleaned up pthreads (now compiles) and rfb.h (first undefine TRUE) --- Makefile | 4 ++-- main.c | 2 +- rfb.h | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2483a05..06885e8 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,8 @@ INCLUDES=-I. VNCSERVERLIB=-L. -lvncserver -L/usr/local/lib -lz -ljpeg # These two lines enable useage of PThreads -#CFLAGS += -DHAVE_PTHREADS -#VNCSERVERLIB += -lpthread +CFLAGS += -DHAVE_PTHREADS +VNCSERVERLIB += -lpthread LIBS=$(LDFLAGS) $(VNCSERVERLIB) diff --git a/main.c b/main.c index e0cc574..54ad19a 100644 --- a/main.c +++ b/main.c @@ -106,7 +106,7 @@ clientOutput(void *data) { rfbClientPtr cl = (rfbClientPtr)data; Bool haveUpdate; - RegionRec updateRegion; + sraRegion* updateRegion; while (1) { haveUpdate = false; diff --git a/rfb.h b/rfb.h index 9628cfd..2864adf 100644 --- a/rfb.h +++ b/rfb.h @@ -37,7 +37,9 @@ typedef CARD32 KeySym; /* for some strange reason, "typedef signed char Bool;" yields a four byte signed int on an SGI, but only for rfbserver.o!!! */ #define Bool signed char +#undef FALSE #define FALSE 0 +#undef TRUE #define TRUE -1 #define xalloc malloc