diff options
Diffstat (limited to 'rfb/rfbproto.h')
| -rw-r--r-- | rfb/rfbproto.h | 36 |
1 files changed, 9 insertions, 27 deletions
diff --git a/rfb/rfbproto.h b/rfb/rfbproto.h index 4d6a1e6..6c1a2fb 100644 --- a/rfb/rfbproto.h +++ b/rfb/rfbproto.h @@ -61,6 +61,7 @@ * messages have to be explained by comments. */ +#include <stdint.h> #if defined(WIN32) && !defined(__MINGW32__) #define LIBVNCSERVER_WORDS_BIGENDIAN @@ -71,7 +72,6 @@ #define SOCKET int #else #include <rfb/rfbconfig.h> -#include <rfb/rfbint.h> #endif #ifdef LIBVNCSERVER_HAVE_LIBZ @@ -82,10 +82,11 @@ #endif #endif -/* some autotool versions do not properly prefix - WORDS_BIGENDIAN, so do that manually */ -#ifdef WORDS_BIGENDIAN -#define LIBVNCSERVER_WORDS_BIGENDIAN +#if LIBVNCSERVER_HAVE_ENDIAN_H +# include <endian.h> +# if __BYTE_ORDER == __BIG_ENDIAN +# define LIBVNCSERVER_WORDS_BIGENDIAN 1 +# endif #endif /* MS compilers don't have strncasecmp */ @@ -93,8 +94,8 @@ #define strncasecmp _strnicmp #endif +#define rfbMax(a,b) (((a)>(b))?(a):(b)) #if !defined(WIN32) || defined(__MINGW32__) -#define max(a,b) (((a)>(b))?(a):(b)) #ifdef LIBVNCSERVER_HAVE_SYS_TIME_H #include <sys/time.h> #endif @@ -109,10 +110,6 @@ typedef int8_t rfbBool; #define TRUE -1 #endif -#ifdef _MSC_VER -#include <stdint.h> -#endif - typedef uint32_t rfbKeySym; typedef uint32_t rfbPixel; @@ -124,7 +121,7 @@ typedef uint32_t in_addr_t; #define INADDR_NONE ((in_addr_t) 0xffffffff) #endif -#define MAX_ENCODINGS 21 +#define MAX_ENCODINGS 64 #define rfbNetworkConnectionSuccess 0 #define rfbNetworkRFBConnectionSuccess 1 @@ -891,21 +888,6 @@ typedef struct { #endif /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - * h264 - h264 encoding. We have an rfbH264Header structure - * giving the number of bytes following. Finally the data follows is - * h264 encoded frame. - */ - -typedef struct { - uint32_t nBytes; - uint32_t slice_type; - uint32_t width; - uint32_t height; -} rfbH264Header; - -#define sz_rfbH264Header 16 - -/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - * XCursor encoding. This is a special encoding used to transmit X-style * cursor shapes from server to clients. Note that for this encoding, * coordinates in rfbFramebufferUpdateRectHeader structure hold hotspot @@ -1100,7 +1082,7 @@ typedef struct _rfbFileTransferMsg { #define rfbRErrorCmd 0xFFFFFFFF/* Error when a command fails on remote side (ret in "size" field) */ #define sz_rfbBlockSize 8192 /* Size of a File Transfer packet (before compression) */ -#define rfbZipDirectoryPrefix "!UVNCDIR-\0" /* Transfered directory are zipped in a file with this prefix. Must end with "-" */ +#define rfbZipDirectoryPrefix "!UVNCDIR-\0" /* Transferred directory are zipped in a file with this prefix. Must end with "-" */ #define sz_rfbZipDirectoryPrefix 9 #define rfbDirPrefix "[ " #define rfbDirSuffix " ]" |