Do away with rfbint.h generation and use stdint.h directly instead.

.gitignore

@@ -61,7 +61,6 @@ examples/vncev
 libtool
 libvncclient/libvncclient.la
 libvncserver/libvncserver.la
-rfb/rfbint.h
 test/blooptest
 test/cargstest
 test/copyrecttest

CMakeLists.txt

@@ -170,7 +170,6 @@ TEST_BIG_ENDIAN(LIBVNCSERVER_WORDS_BIGENDIAN)
 # inline
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/rfb/rfbconfig.h.cmake ${CMAKE_BINARY_DIR}/rfb/rfbconfig.h)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/rfb/rfbint.h.cmake ${CMAKE_BINARY_DIR}/rfb/rfbint.h)
 
 set(LIBVNCSERVER_SOURCES
     ${LIBVNCSERVER_DIR}/main.c
@@ -375,7 +374,6 @@ install_files(/include/rfb FILES
     rfb/rfb.h
     rfb/rfbclient.h
     rfb/rfbconfig.h
-    rfb/rfbint.h
     rfb/rfbproto.h
     rfb/rfbregion.h
 )

Doxyfile

@@ -661,7 +661,6 @@ RECURSIVE              = YES
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
 EXCLUDE                = rfb/rfbconfig.h \
-                         rfb/rfbint.h \
                          rfb/default8x16.h
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or 

Makefile.am

@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS=libvncserver examples libvncclient webclients client_examples test
 DIST_SUBDIRS=libvncserver examples libvncclient webclients client_examples test
-EXTRA_DIST = CMakeLists.txt rfb/rfbint.h.cmake rfb/rfbconfig.h.cmake
+EXTRA_DIST = CMakeLists.txt rfb/rfbconfig.h.cmake
 
 bin_SCRIPTS = libvncserver-config
 
@@ -10,9 +10,8 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libvncserver.pc libvncclient.pc
 
 includedir=$(prefix)/include/rfb
-#include_HEADERS=rfb.h rfbconfig.h rfbint.h rfbproto.h keysym.h rfbregion.h
 
-include_HEADERS=rfb/rfb.h rfb/rfbconfig.h rfb/rfbint.h rfb/rfbproto.h \
+include_HEADERS=rfb/rfb.h rfb/rfbconfig.h rfb/rfbproto.h \
 	rfb/keysym.h rfb/rfbregion.h rfb/rfbclient.h
 
 $(PACKAGE)-$(VERSION).tar.gz: dist

configure.ac

@@ -498,7 +498,7 @@ fi
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([arpa/inet.h endian.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/endian.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h ws2tcpip.h])
+AC_CHECK_HEADERS([arpa/inet.h endian.h fcntl.h netdb.h netinet/in.h stdlib.h stdint.h string.h sys/endian.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h ws2tcpip.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -508,11 +508,6 @@ AC_TYPE_SIZE_T
 AC_HEADER_TIME
 AC_HEADER_SYS_WAIT
 AX_TYPE_SOCKLEN_T
-if test ! -d ./rfb; then
-	echo "creating subdir ./rfb for rfbint.h"
-	mkdir ./rfb 
-fi
-AX_CREATE_STDINT_H(rfb/rfbint.h)
 AC_CACHE_CHECK([for in_addr_t],
         vnc_cv_inaddrt, [
                 AC_TRY_COMPILE([#include <sys/types.h>

libvncserver/Makefile.am

@@ -30,9 +30,8 @@ WEBSOCKETSSRCS = websockets.c $(WEBSOCKETSSSLSRCS)
 endif
 
 includedir=$(prefix)/include/rfb
-#include_HEADERS=rfb.h rfbconfig.h rfbint.h rfbproto.h keysym.h rfbregion.h
 
-include_HEADERS=../rfb/rfb.h ../rfb/rfbconfig.h ../rfb/rfbint.h \
+include_HEADERS=../rfb/rfb.h ../rfb/rfbconfig.h \
 	../rfb/rfbproto.h ../rfb/keysym.h ../rfb/rfbregion.h ../rfb/rfbclient.h
 
 noinst_HEADERS=../common/d3des.h ../rfb/default8x16.h zrleoutstream.h \

rfb/rfbproto.h

@@ -70,7 +70,6 @@
 #define SOCKET int
 #else
 #include <rfb/rfbconfig.h>
-#include <rfb/rfbint.h>
 #endif
 
 #ifdef LIBVNCSERVER_HAVE_LIBZ
@@ -108,9 +107,7 @@ typedef int8_t rfbBool;
 #define TRUE -1
 #endif
 
-#ifdef _MSC_VER
 #include <stdint.h>
-#endif
 
 typedef uint32_t rfbKeySym;
 typedef uint32_t rfbPixel;