From ae5142bdbd98f8a196d166331fa193ea20599cd9 Mon Sep 17 00:00:00 2001
From: dscho <dscho>
Date: Wed, 30 Jul 2003 14:58:32 +0000
Subject: [PATCH] add rfbclient.h to distribution; avoid C++ style comments

---
 Makefile.am     | 2 +-
 Makefile.in     | 2 +-
 rfb/rfb.h       | 3 +--
 rfb/rfbclient.h | 2 --
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f37f465..48f738d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ includedir=$(prefix)/include/rfb
 #include_HEADERS=rfb.h rfbconfig.h rfbint.h rfbproto.h keysym.h rfbregion.h
 
 include_HEADERS=rfb/rfb.h rfb/rfbconfig.h rfb/rfbint.h rfb/rfbproto.h \
-	rfb/keysym.h rfb/rfbregion.h
+	rfb/keysym.h rfb/rfbregion.h rfb/rfbclient.h
 
 noinst_HEADERS=d3des.h zrleDecode.h zrleEncode.h rfb/default8x16.h \
 	rdr/Exception.h rdr/FdInStream.h rdr/FdOutStream.h \
diff --git a/Makefile.in b/Makefile.in
index 6561885..6010bc9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -86,7 +86,7 @@ bin_SCRIPTS = libvncserver-config
 
 #include_HEADERS=rfb.h rfbconfig.h rfbint.h rfbproto.h keysym.h rfbregion.h
 include_HEADERS = rfb/rfb.h rfb/rfbconfig.h rfb/rfbint.h rfb/rfbproto.h \
-	rfb/keysym.h rfb/rfbregion.h
+	rfb/keysym.h rfb/rfbregion.h rfb/rfbclient.h
 
 
 noinst_HEADERS = d3des.h zrleDecode.h zrleEncode.h rfb/default8x16.h \
diff --git a/rfb/rfb.h b/rfb/rfb.h
index 0d3944e..171b076 100644
--- a/rfb/rfb.h
+++ b/rfb/rfb.h
@@ -424,7 +424,6 @@ typedef struct _rfbClientRec {
 
 #ifdef LIBVNCSERVER_HAVE_LIBJPEG
     /* tight encoding -- preserve zlib streams' state for each client */
-  //#ifdef LIBVNCSERVER_HAVE_LIBJPEG
     z_stream zsStruct[4];
     rfbBool zsActive[4];
     int zsLevel[4];
@@ -713,7 +712,7 @@ void rfbDrawLine(rfbScreenInfoPtr s,int x1,int y1,int x2,int y2,rfbPixel col);
    with a NULL.
    It returns the index in the list or -1 if cancelled or something else
    wasn't kosher. */
-typedef void (*SelectionChangedHookPtr)(int index);
+typedef void (*SelectionChangedHookPtr)(int _index);
 extern int rfbSelectBox(rfbScreenInfoPtr rfbScreen,
 			rfbFontDataPtr font, char** list,
 			int x1, int y1, int x2, int y2,
diff --git a/rfb/rfbclient.h b/rfb/rfbclient.h
index b53d36e..c738409 100644
--- a/rfb/rfbclient.h
+++ b/rfb/rfbclient.h
@@ -145,8 +145,6 @@ typedef struct _rfbClient {
 
 /* cursor.c */
 
-// TODO: make callback
-
 extern rfbBool HandleCursorShape(rfbClient* client,int xhot, int yhot, int width, int height, uint32_t enc);
 
 /* listen.c */