summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordscho <dscho>2003-08-03 00:12:22 +0000
committerdscho <dscho>2003-08-03 00:12:22 +0000
commit79c414ab99d16b92e6436388cfb9f70f7c04ccde (patch)
tree75a1713eba692930361dc68affd79952c4acdd4f
parent34316ef618b8994faaa73fc47e0bee944dec34ca (diff)
downloadlibtdevnc-79c414ab.tar.gz
libtdevnc-79c414ab.zip
forgot to change WORDS_BIGENDIAN to LIBVNCSERVER_BIGENDIAN; #undef VERSION unneccessary...
-rw-r--r--rfb/rfbproto.h19
1 files changed, 10 insertions, 9 deletions
diff --git a/rfb/rfbproto.h b/rfb/rfbproto.h
index 72017e6..4dee59e 100644
--- a/rfb/rfbproto.h
+++ b/rfb/rfbproto.h
@@ -47,9 +47,17 @@
*/
+#if defined(WIN32)
+#define LIBVNCSERVER_WORDS_BIGENDIAN
+#define rfbBool int
+#include <sys/timeb.h>
+#include <winsock.h>
+#undef SOCKET
+#define SOCKET int
+#else
#include <rfb/rfbconfig.h>
-#undef VERSION
#include <rfb/rfbint.h>
+#endif
#include <rfb/keysym.h>
#ifdef LIBVNCSERVER_HAVE_LIBZ
@@ -57,14 +65,7 @@
#endif
-#if defined(WIN32)
-#define WORDS_BIGENDIAN
-#define rfbBool int
-#include <sys/timeb.h>
-#include <winsock.h>
-#undef SOCKET
-#define SOCKET int
-#else
+#if !defined(WIN32)
#define max(a,b) (((a)>(b))?(a):(b))
#ifdef LIBVNCSERVER_HAVE_SYS_TIME_H
#include <sys/time.h>