diff options
Diffstat (limited to 'rfb')
| -rw-r--r-- | rfb/rfb.h | 1 | ||||
| -rw-r--r-- | rfb/rfbclient.h | 4 | ||||
| -rw-r--r-- | rfb/rfbconfig.h.cmake | 3 | ||||
| -rw-r--r-- | rfb/rfbint.h.cmake | 4 | ||||
| -rw-r--r-- | rfb/rfbproto.h | 4 |
5 files changed, 9 insertions, 7 deletions
@@ -54,6 +54,7 @@ extern "C" #ifdef WIN32 #undef SOCKET +typedef UINT32 in_addr_t; #include <winsock2.h> #ifdef LIBVNCSERVER_HAVE_WS2TCPIP_H #undef socklen_t diff --git a/rfb/rfbclient.h b/rfb/rfbclient.h index d90342b..505dd9c 100644 --- a/rfb/rfbclient.h +++ b/rfb/rfbclient.h @@ -38,8 +38,12 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#if LIBVNCSERVER_HAVE_SYS_TIME_H #include <sys/time.h> +#endif +#if LIBVNCSERVER_HAVE_UNISTD_H #include <unistd.h> +#endif #include <rfb/rfbproto.h> #include <rfb/keysym.h> diff --git a/rfb/rfbconfig.h.cmake b/rfb/rfbconfig.h.cmake index 5bd6569..86f7ae3 100644 --- a/rfb/rfbconfig.h.cmake +++ b/rfb/rfbconfig.h.cmake @@ -51,6 +51,9 @@ /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */ #cmakedefine LIBVNCSERVER_HAVE_SYS_WAIT_H 1 +/* Define to 1 if you have <sys/uio.h> */ +#cmakedefine LIBVNCSERVER_HAVE_SYS_UIO_H 1 + /* Define to 1 if you have the <unistd.h> header file. */ #cmakedefine LIBVNCSERVER_HAVE_UNISTD_H 1 diff --git a/rfb/rfbint.h.cmake b/rfb/rfbint.h.cmake deleted file mode 100644 index 17de6cd..0000000 --- a/rfb/rfbint.h.cmake +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef _RFB_RFBINT_H -#define _RFB_RFBINT_H 1 -/* empty ... */ -#endif diff --git a/rfb/rfbproto.h b/rfb/rfbproto.h index ba643b1..f0d6ea1 100644 --- a/rfb/rfbproto.h +++ b/rfb/rfbproto.h @@ -64,11 +64,9 @@ #if defined(WIN32) && !defined(__MINGW32__) #define LIBVNCSERVER_WORDS_BIGENDIAN -#define rfbBool int +typedef int8_t rfbBool; #include <sys/timeb.h> #include <winsock2.h> -#undef SOCKET -#define SOCKET int #else #include <rfb/rfbconfig.h> #endif |