summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgkiagia <gkiagia@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-11-14 10:30:36 +0000
committergkiagia <gkiagia@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-11-14 10:30:36 +0000
commit22946807bea930004684ffd6bf7bc48171988391 (patch)
treedc59146f3105951f60583f9d12534a54280f5789
parente0f089c9ccae37a816970f967e2892f28e305f14 (diff)
downloadlibvncserver-22946807bea930004684ffd6bf7bc48171988391.zip
libvncserver-22946807bea930004684ffd6bf7bc48171988391.tar.gz
Include the local rfb headers to avoid build errors in case libvncserver is also installed in the system location.
BUG: 256642 git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdenetwork/krfb/libvncserver@1196901 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rwxr-xr-xauth.c2
-rw-r--r--cargs.c2
-rwxr-xr-xcorre.c2
-rw-r--r--cursor.c4
-rwxr-xr-xcutpaste.c2
-rwxr-xr-xdraw.c2
-rwxr-xr-xfont.c2
-rwxr-xr-xhextile.c2
-rwxr-xr-xhttpd.c2
-rw-r--r--main.c4
-rw-r--r--rfb/rfb.h2
-rw-r--r--rfb/rfbclient.h4
-rwxr-xr-xrfbregion.c4
-rw-r--r--rfbserver.c4
-rwxr-xr-xrre.c2
-rw-r--r--scale.c4
-rwxr-xr-xselbox.c4
-rwxr-xr-xsockets.c2
-rwxr-xr-xstats.c2
-rw-r--r--tight.c2
-rwxr-xr-xtranslate.c4
-rw-r--r--ultra.c2
-rw-r--r--vncauth.c2
-rw-r--r--zlib.c2
24 files changed, 32 insertions, 32 deletions
diff --git a/auth.c b/auth.c
index 52177e6..c353a1e 100755
--- a/auth.c
+++ b/auth.c
@@ -27,7 +27,7 @@
* USA.
*/
-#include <rfb/rfb.h>
+#include "rfb/rfb.h"
/* RFB 3.8 clients are well informed */
void rfbClientSendString(rfbClientPtr cl, const char *reason);
diff --git a/cargs.c b/cargs.c
index 332ffa1..186723a 100644
--- a/cargs.c
+++ b/cargs.c
@@ -12,7 +12,7 @@
* see GPL (latest version) for full details
*/
-#include <rfb/rfb.h>
+#include "rfb/rfb.h"
extern int rfbStringToAddr(char *str, in_addr_t *iface);
diff --git a/corre.c b/corre.c
index bb07c77..fdab18a 100755
--- a/corre.c
+++ b/corre.c
@@ -27,7 +27,7 @@
* USA.
*/
-#include <rfb/rfb.h>
+#include "rfb/rfb.h"
/*
* rreBeforeBuf contains pixel data in the client's format.
diff --git a/cursor.c b/cursor.c
index 154bf11..d6ef83e 100644
--- a/cursor.c
+++ b/cursor.c
@@ -22,8 +22,8 @@
* USA.
*/
-#include <rfb/rfb.h>
-#include <rfb/rfbregion.h>
+#include "rfb/rfb.h"
+#include "rfb/rfbregion.h"
#include "private.h"
void rfbScaledScreenUpdate(rfbScreenInfoPtr screen, int x1, int y1, int x2, int y2);
diff --git a/cutpaste.c b/cutpaste.c
index 6a9dcb9..6533fd2 100755
--- a/cutpaste.c
+++ b/cutpaste.c
@@ -23,7 +23,7 @@
* USA.
*/
-#include <rfb/rfb.h>
+#include "rfb/rfb.h"
/*
diff --git a/draw.c b/draw.c
index 7e1ed49..14603ee 100755
--- a/draw.c
+++ b/draw.c
@@ -1,4 +1,4 @@
-#include <rfb/rfb.h>
+#include "rfb/rfb.h"
void rfbFillRect(rfbScreenInfoPtr s,int x1,int y1,int x2,int y2,rfbPixel col)
{
diff --git a/font.c b/font.c
index 8ba1020..e5bfca5 100755
--- a/font.c
+++ b/font.c
@@ -1,4 +1,4 @@
-#include <rfb/rfb.h>
+#include "rfb/rfb.h"
int rfbDrawChar(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,
int x,int y,unsigned char c,rfbPixel col)
diff --git a/hextile.c b/hextile.c
index 52920d8..4c2203d 100755
--- a/hextile.c
+++ b/hextile.c
@@ -25,7 +25,7 @@
* USA.
*/
-#include <rfb/rfb.h>
+#include "rfb/rfb.h"
static rfbBool sendHextiles8(rfbClientPtr cl, int x, int y, int w, int h);
static rfbBool sendHextiles16(rfbClientPtr cl, int x, int y, int w, int h);
diff --git a/httpd.c b/httpd.c
index c183543..7988ce3 100755
--- a/httpd.c
+++ b/httpd.c
@@ -22,7 +22,7 @@
* USA.
*/
-#include <rfb/rfb.h>
+#include "rfb/rfb.h"
#include <ctype.h>
#ifdef LIBVNCSERVER_HAVE_UNISTD_H
diff --git a/main.c b/main.c
index f73cef3..aaa5e6c 100644
--- a/main.c
+++ b/main.c
@@ -13,8 +13,8 @@
#ifdef __STRICT_ANSI__
#define _BSD_SOURCE
#endif
-#include <rfb/rfb.h>
-#include <rfb/rfbregion.h>
+#include "rfb/rfb.h"
+#include "rfb/rfbregion.h"
#include "private.h"
#include <stdarg.h>
diff --git a/rfb/rfb.h b/rfb/rfb.h
index 9546cad..7632e97 100644
--- a/rfb/rfb.h
+++ b/rfb/rfb.h
@@ -37,7 +37,7 @@ extern "C"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <rfb/rfbproto.h>
+#include "rfbproto.h"
#ifdef LIBVNCSERVER_HAVE_SYS_TYPES_H
#include <sys/types.h>
diff --git a/rfb/rfbclient.h b/rfb/rfbclient.h
index 56806cf..ecebc57 100644
--- a/rfb/rfbclient.h
+++ b/rfb/rfbclient.h
@@ -31,8 +31,8 @@
#include <string.h>
#include <sys/time.h>
#include <unistd.h>
-#include <rfb/rfbproto.h>
-#include <rfb/keysym.h>
+#include "rfbproto.h"
+#include "keysym.h"
#define rfbClientSwap16IfLE(s) \
(*(char *)&client->endianTest ? ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) : (s))
diff --git a/rfbregion.c b/rfbregion.c
index 0ab8a12..5854336 100755
--- a/rfbregion.c
+++ b/rfbregion.c
@@ -5,8 +5,8 @@
* Only deals with rectangular regions, though.
*/
-#include <rfb/rfb.h>
-#include <rfb/rfbregion.h>
+#include "rfb/rfb.h"
+#include "rfb/rfbregion.h"
/* -=- Internal Span structure */
diff --git a/rfbserver.c b/rfbserver.c
index 8a367bf..1614bb3 100644
--- a/rfbserver.c
+++ b/rfbserver.c
@@ -29,8 +29,8 @@
#define _BSD_SOURCE
#endif
#include <string.h>
-#include <rfb/rfb.h>
-#include <rfb/rfbregion.h>
+#include "rfb/rfb.h"
+#include "rfb/rfbregion.h"
#include "private.h"
#ifdef LIBVNCSERVER_HAVE_FCNTL_H
diff --git a/rre.c b/rre.c
index b43561a..f174692 100755
--- a/rre.c
+++ b/rre.c
@@ -26,7 +26,7 @@
* USA.
*/
-#include <rfb/rfb.h>
+#include "rfb/rfb.h"
/*
* rreBeforeBuf contains pixel data in the client's format.
diff --git a/scale.c b/scale.c
index f33c145..1ba4d86 100644
--- a/scale.c
+++ b/scale.c
@@ -29,8 +29,8 @@
#define _BSD_SOURCE
#endif
#include <string.h>
-#include <rfb/rfb.h>
-#include <rfb/rfbregion.h>
+#include "rfb/rfb.h"
+#include "rfb/rfbregion.h"
#include "private.h"
#ifdef LIBVNCSERVER_HAVE_FCNTL_H
diff --git a/selbox.c b/selbox.c
index bbc6d52..3ad428f 100755
--- a/selbox.c
+++ b/selbox.c
@@ -1,6 +1,6 @@
#include <ctype.h>
-#include <rfb/rfb.h>
-#include <rfb/keysym.h>
+#include "rfb/rfb.h"
+#include "rfb/keysym.h"
typedef struct {
rfbScreenInfoPtr screen;
diff --git a/sockets.c b/sockets.c
index cd5b669..71e1802 100755
--- a/sockets.c
+++ b/sockets.c
@@ -40,7 +40,7 @@
* USA.
*/
-#include <rfb/rfb.h>
+#include "rfb/rfb.h"
#ifdef LIBVNCSERVER_HAVE_SYS_TYPES_H
#include <sys/types.h>
diff --git a/stats.c b/stats.c
index d5d6925..f13a2ac 100755
--- a/stats.c
+++ b/stats.c
@@ -24,7 +24,7 @@
* USA.
*/
-#include <rfb/rfb.h>
+#include "rfb/rfb.h"
char *messageNameServer2Client(uint32_t type, char *buf, int len);
char *messageNameClient2Server(uint32_t type, char *buf, int len);
diff --git a/tight.c b/tight.c
index d9bc844..d76e143 100644
--- a/tight.c
+++ b/tight.c
@@ -25,7 +25,7 @@
*/
/*#include <stdio.h>*/
-#include <rfb/rfb.h>
+#include "rfb/rfb.h"
#include "private.h"
#ifdef WIN32
diff --git a/translate.c b/translate.c
index 500d47d..182cf65 100755
--- a/translate.c
+++ b/translate.c
@@ -23,8 +23,8 @@
* USA.
*/
-#include <rfb/rfb.h>
-#include <rfb/rfbregion.h>
+#include "rfb/rfb.h"
+#include "rfb/rfbregion.h"
static void PrintPixelFormat(rfbPixelFormat *pf);
static rfbBool rfbSetClientColourMapBGR233(rfbClientPtr cl);
diff --git a/ultra.c b/ultra.c
index a802026..6830648 100644
--- a/ultra.c
+++ b/ultra.c
@@ -7,7 +7,7 @@
* This is 'UltraZip' and is currently not implemented.
*/
-#include <rfb/rfb.h>
+#include "rfb/rfb.h"
#include "minilzo.h"
/*
diff --git a/vncauth.c b/vncauth.c
index b8ee288..01bad00 100644
--- a/vncauth.c
+++ b/vncauth.c
@@ -31,7 +31,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-#include <rfb/rfbproto.h>
+#include "rfb/rfbproto.h"
#include "d3des.h"
#include <string.h>
diff --git a/zlib.c b/zlib.c
index 7b20f74..6d171d9 100644
--- a/zlib.c
+++ b/zlib.c
@@ -30,7 +30,7 @@
* or send email to feedback@developvnc.org.
*/
-#include <rfb/rfb.h>
+#include "rfb/rfb.h"
/*
* zlibBeforeBuf contains pixel data in the client's format.
OpenPOWER on IntegriCloud