diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-02-06 16:56:55 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-02-06 16:56:55 +0100 |
| commit | f3f392caec43b4095bc1d84b315ed7972c13c144 (patch) | |
| tree | 5c4ba8b5d38f1ae33de71507c5634a15a0b35bfe /rfb/rfbproto.h | |
| parent | 8c081c8888bccbf5adfe0fc4ec518e2cbfba9871 (diff) | |
| parent | 0a70095271d845d16a3ed17354841b01f33963ad (diff) | |
| download | libtdevnc-f3f392caec43b4095bc1d84b315ed7972c13c144.tar.gz libtdevnc-f3f392caec43b4095bc1d84b315ed7972c13c144.zip | |
Merge tag 'LibVNCServer-0.9.12'
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'rfb/rfbproto.h')
| -rw-r--r-- | rfb/rfbproto.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/rfb/rfbproto.h b/rfb/rfbproto.h index 6c1a2fb..8f7c2f9 100644 --- a/rfb/rfbproto.h +++ b/rfb/rfbproto.h @@ -65,14 +65,11 @@ #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 +#include <rfb/rfbconfig.h> #ifdef LIBVNCSERVER_HAVE_LIBZ #include <zlib.h> @@ -298,6 +295,7 @@ typedef char rfbProtocolVersionMsg[13]; /* allow extra byte for null */ #define rfbUltra 17 #define rfbTLS 18 #define rfbVeNCrypt 19 +#define rfbSASL 20 #define rfbARD 30 #define rfbMSLogon 0xfffffffa @@ -449,6 +447,7 @@ typedef struct { #define rfbEncodingTightPng 0xFFFFFEFC /* -260 */ #define rfbEncodingZlibHex 8 #define rfbEncodingUltra 9 +#define rfbEncodingTRLE 15 #define rfbEncodingZRLE 16 #define rfbEncodingZYWRLE 17 |