converted CARD{8,16,32} to uint{8,16,32}_t and included support for stdint.h

1 files changed, 5 insertions, 3 deletions

diff --git a/main.c b/main.c
index 59ddf93..be2e270 100644
--- a/main.c
+++ b/main.c
@@ -10,8 +10,6 @@
  *  see GPL (latest version) for full details
  */
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <stdarg.h>
 #include <errno.h>
 
@@ -20,12 +18,16 @@
 #define true -1
 #endif
 
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+
 #ifndef WIN32
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <unistd.h>
 #endif
+
 #include <signal.h>
 #include <time.h>
 
@@ -734,7 +736,7 @@ void rfbInitServer(rfbScreenInfoPtr rfbScreen)
   httpInitSockets(rfbScreen);
 }
 
-#ifdef WIN32
+#ifndef HAVE_GETTIMEOFDAY
 #include <fcntl.h>
 #include <conio.h>
 #include <sys/timeb.h>