diff options
| author | Christian Beier <dontmind@freeshell.org> | 2017-09-02 17:20:58 +0200 |
|---|---|---|
| committer | Christian Beier <dontmind@freeshell.org> | 2017-09-02 18:01:52 +0200 |
| commit | df11e806a31ec0fe0f3f58917ed1e98769adb910 (patch) | |
| tree | ff3c45fe1009d5cc245ecabfea99af128a70537a | |
| parent | 666f37efc08c20fa37b6a8ca5967b066118f56aa (diff) | |
| download | libtdevnc-df11e806a31ec0fe0f3f58917ed1e98769adb910.tar.gz libtdevnc-df11e806a31ec0fe0f3f58917ed1e98769adb910.zip | |
Move HAVE_SASL #ifdefs into header file to have less LOC
| -rw-r--r-- | libvncclient/rfbproto.c | 3 | ||||
| -rw-r--r-- | libvncclient/rfbsasl.h | 4 | ||||
| -rw-r--r-- | libvncclient/sockets.c | 3 | ||||
| -rw-r--r-- | rfb/rfbproto.h | 2 |
4 files changed, 4 insertions, 8 deletions
diff --git a/libvncclient/rfbproto.c b/libvncclient/rfbproto.c index 27589b8..572af9d 100644 --- a/libvncclient/rfbproto.c +++ b/libvncclient/rfbproto.c @@ -66,10 +66,7 @@ #include <gcrypt.h> #endif -#ifdef LIBVNCSERVER_HAVE_SASL #include "rfbsasl.h" -#endif /* LIBVNCSERVER_HAVE_SASL */ - #include "minilzo.h" #include "tls.h" diff --git a/libvncclient/rfbsasl.h b/libvncclient/rfbsasl.h index 8231096..2936364 100644 --- a/libvncclient/rfbsasl.h +++ b/libvncclient/rfbsasl.h @@ -20,6 +20,8 @@ * USA. */ +#ifdef LIBVNCSERVER_HAVE_SASL + #include <rfb/rfbclient.h> /* @@ -32,4 +34,6 @@ rfbBool HandleSASLAuth(rfbClient *client); */ int ReadFromSASL(rfbClient* client, char *out, unsigned int n); +#endif /* LIBVNCSERVER_HAVE_SASL */ + #endif /* RFBSASL_H */ diff --git a/libvncclient/sockets.c b/libvncclient/sockets.c index 8ed51a5..2d505c7 100644 --- a/libvncclient/sockets.c +++ b/libvncclient/sockets.c @@ -58,10 +58,7 @@ #include <netdb.h> #endif #include "tls.h" - -#ifdef LIBVNCSERVER_HAVE_SASL #include "rfbsasl.h" -#endif /* LIBVNCSERVER_HAVE_SASL */ #ifdef _MSC_VER # define snprintf _snprintf diff --git a/rfb/rfbproto.h b/rfb/rfbproto.h index c5b2723..b447170 100644 --- a/rfb/rfbproto.h +++ b/rfb/rfbproto.h @@ -286,9 +286,7 @@ typedef char rfbProtocolVersionMsg[13]; /* allow extra byte for null */ #define rfbUltra 17 #define rfbTLS 18 #define rfbVeNCrypt 19 -#ifdef LIBVNCSERVER_HAVE_SASL #define rfbSASL 20 -#endif /* LIBVNCSERVER_HAVE_SASL */ #define rfbARD 30 #define rfbMSLogon 0xfffffffa |