Commit 22946807 authored by gkiagia's avatar gkiagia

Include the local rfb headers to avoid build errors in case libvncserver is...

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
parent e0f089c9
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
* USA. * USA.
*/ */
#include <rfb/rfb.h> #include "rfb/rfb.h"
/* RFB 3.8 clients are well informed */ /* RFB 3.8 clients are well informed */
void rfbClientSendString(rfbClientPtr cl, const char *reason); void rfbClientSendString(rfbClientPtr cl, const char *reason);
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
* see GPL (latest version) for full details * see GPL (latest version) for full details
*/ */
#include <rfb/rfb.h> #include "rfb/rfb.h"
extern int rfbStringToAddr(char *str, in_addr_t *iface); extern int rfbStringToAddr(char *str, in_addr_t *iface);
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
* USA. * USA.
*/ */
#include <rfb/rfb.h> #include "rfb/rfb.h"
/* /*
* rreBeforeBuf contains pixel data in the client's format. * rreBeforeBuf contains pixel data in the client's format.
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
* USA. * USA.
*/ */
#include <rfb/rfb.h> #include "rfb/rfb.h"
#include <rfb/rfbregion.h> #include "rfb/rfbregion.h"
#include "private.h" #include "private.h"
void rfbScaledScreenUpdate(rfbScreenInfoPtr screen, int x1, int y1, int x2, int y2); void rfbScaledScreenUpdate(rfbScreenInfoPtr screen, int x1, int y1, int x2, int y2);
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
* USA. * USA.
*/ */
#include <rfb/rfb.h> #include "rfb/rfb.h"
/* /*
......
#include <rfb/rfb.h> #include "rfb/rfb.h"
void rfbFillRect(rfbScreenInfoPtr s,int x1,int y1,int x2,int y2,rfbPixel col) void rfbFillRect(rfbScreenInfoPtr s,int x1,int y1,int x2,int y2,rfbPixel col)
{ {
......
#include <rfb/rfb.h> #include "rfb/rfb.h"
int rfbDrawChar(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font, int rfbDrawChar(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,
int x,int y,unsigned char c,rfbPixel col) int x,int y,unsigned char c,rfbPixel col)
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
* USA. * USA.
*/ */
#include <rfb/rfb.h> #include "rfb/rfb.h"
static rfbBool sendHextiles8(rfbClientPtr cl, int x, int y, int w, int 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); static rfbBool sendHextiles16(rfbClientPtr cl, int x, int y, int w, int h);
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* USA. * USA.
*/ */
#include <rfb/rfb.h> #include "rfb/rfb.h"
#include <ctype.h> #include <ctype.h>
#ifdef LIBVNCSERVER_HAVE_UNISTD_H #ifdef LIBVNCSERVER_HAVE_UNISTD_H
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#ifdef __STRICT_ANSI__ #ifdef __STRICT_ANSI__
#define _BSD_SOURCE #define _BSD_SOURCE
#endif #endif
#include <rfb/rfb.h> #include "rfb/rfb.h"
#include <rfb/rfbregion.h> #include "rfb/rfbregion.h"
#include "private.h" #include "private.h"
#include <stdarg.h> #include <stdarg.h>
......
...@@ -37,7 +37,7 @@ extern "C" ...@@ -37,7 +37,7 @@ extern "C"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <rfb/rfbproto.h> #include "rfbproto.h"
#ifdef LIBVNCSERVER_HAVE_SYS_TYPES_H #ifdef LIBVNCSERVER_HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
#include <string.h> #include <string.h>
#include <sys/time.h> #include <sys/time.h>
#include <unistd.h> #include <unistd.h>
#include <rfb/rfbproto.h> #include "rfbproto.h"
#include <rfb/keysym.h> #include "keysym.h"
#define rfbClientSwap16IfLE(s) \ #define rfbClientSwap16IfLE(s) \
(*(char *)&client->endianTest ? ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) : (s)) (*(char *)&client->endianTest ? ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) : (s))
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* Only deals with rectangular regions, though. * Only deals with rectangular regions, though.
*/ */
#include <rfb/rfb.h> #include "rfb/rfb.h"
#include <rfb/rfbregion.h> #include "rfb/rfbregion.h"
/* -=- Internal Span structure */ /* -=- Internal Span structure */
......
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
#define _BSD_SOURCE #define _BSD_SOURCE
#endif #endif
#include <string.h> #include <string.h>
#include <rfb/rfb.h> #include "rfb/rfb.h"
#include <rfb/rfbregion.h> #include "rfb/rfbregion.h"
#include "private.h" #include "private.h"
#ifdef LIBVNCSERVER_HAVE_FCNTL_H #ifdef LIBVNCSERVER_HAVE_FCNTL_H
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* USA. * USA.
*/ */
#include <rfb/rfb.h> #include "rfb/rfb.h"
/* /*
* rreBeforeBuf contains pixel data in the client's format. * rreBeforeBuf contains pixel data in the client's format.
......
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
#define _BSD_SOURCE #define _BSD_SOURCE
#endif #endif
#include <string.h> #include <string.h>
#include <rfb/rfb.h> #include "rfb/rfb.h"
#include <rfb/rfbregion.h> #include "rfb/rfbregion.h"
#include "private.h" #include "private.h"
#ifdef LIBVNCSERVER_HAVE_FCNTL_H #ifdef LIBVNCSERVER_HAVE_FCNTL_H
......
#include <ctype.h> #include <ctype.h>
#include <rfb/rfb.h> #include "rfb/rfb.h"
#include <rfb/keysym.h> #include "rfb/keysym.h"
typedef struct { typedef struct {
rfbScreenInfoPtr screen; rfbScreenInfoPtr screen;
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
* USA. * USA.
*/ */
#include <rfb/rfb.h> #include "rfb/rfb.h"
#ifdef LIBVNCSERVER_HAVE_SYS_TYPES_H #ifdef LIBVNCSERVER_HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
* USA. * USA.
*/ */
#include <rfb/rfb.h> #include "rfb/rfb.h"
char *messageNameServer2Client(uint32_t type, char *buf, int len); char *messageNameServer2Client(uint32_t type, char *buf, int len);
char *messageNameClient2Server(uint32_t type, char *buf, int len); char *messageNameClient2Server(uint32_t type, char *buf, int len);
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
*/ */
/*#include <stdio.h>*/ /*#include <stdio.h>*/
#include <rfb/rfb.h> #include "rfb/rfb.h"
#include "private.h" #include "private.h"
#ifdef WIN32 #ifdef WIN32
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
* USA. * USA.
*/ */
#include <rfb/rfb.h> #include "rfb/rfb.h"
#include <rfb/rfbregion.h> #include "rfb/rfbregion.h"
static void PrintPixelFormat(rfbPixelFormat *pf); static void PrintPixelFormat(rfbPixelFormat *pf);
static rfbBool rfbSetClientColourMapBGR233(rfbClientPtr cl); static rfbBool rfbSetClientColourMapBGR233(rfbClientPtr cl);
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* This is 'UltraZip' and is currently not implemented. * This is 'UltraZip' and is currently not implemented.
*/ */
#include <rfb/rfb.h> #include "rfb/rfb.h"
#include "minilzo.h" #include "minilzo.h"
/* /*
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <rfb/rfbproto.h> #include "rfb/rfbproto.h"
#include "d3des.h" #include "d3des.h"
#include <string.h> #include <string.h>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
* or send email to feedback@developvnc.org. * or send email to feedback@developvnc.org.
*/ */
#include <rfb/rfb.h> #include "rfb/rfb.h"
/* /*
* zlibBeforeBuf contains pixel data in the client's format. * zlibBeforeBuf contains pixel data in the client's format.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment