rfbclient.h: use 'extern "C"' to make it convenient to include from C++

3 files changed, 15 insertions, 2 deletions

diff --git a/AUTHORS b/AUTHORS
index a4e5316..cf3bf5d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -29,8 +29,8 @@ Oliver Mihatsch, Greg Sternberg, Werner Hofer, Giampiero Giancipoli,
 Glenn Mabutt, Paul Kreiner, Erik Kunze, Mike Frysinger, Martin Waitz,
 Mark McLoughlin, Paul Fox, Juan Jose Costello, Andre Leiadella,
 Alberto Lusiani, Malvina Mazin, Dave Stuart, Rohit Kumar, Donald Dugger,
-Steven Carr, Uwe Völker, Charles Coffing, Guillaume Rousse, and
-Alessandro Praduroux.
+Steven Carr, Uwe Völker, Charles Coffing, Guillaume Rousse,
+Alessandro Praduroux, and Brad Hards.
 
 Probably I forgot quite a few people sending a patch here and there, which
 really made a difference. Without those, some obscure bugs still would
diff --git a/ChangeLog b/ChangeLog
index e5abce6..ef2d308 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-06  Brad Hards <bradh@users.sourceforge.net>
+	* rfb/rfbclient.h: use 'extern "C"' to make it convenient to
+	  include from C++.
+
 2007-04-05  Alessandro Praduroux <pradu@pradu.it>
 	* rfb/rfb.h: do not misplace guards, which makes it possible to
 	  double include rfb.h from C++.
diff --git a/rfb/rfbclient.h b/rfb/rfbclient.h
index 541fee1..975a66a 100644
--- a/rfb/rfbclient.h
+++ b/rfb/rfbclient.h
@@ -54,6 +54,11 @@
 #define DEFAULT_VIA_CMD     \
   (DEFAULT_SSH_CMD " -f -L %L:%H:%R %G sleep 20")
 
+#if(defined __cplusplus)
+extern "C"
+{
+#endif
+
 /* vncrec */
 
 typedef struct {
@@ -322,5 +327,9 @@ rfbBool rfbInitClient(rfbClient* client,int* argc,char** argv);
 /* rfbClientCleanup() does not touch client->frameBuffer */
 void rfbClientCleanup(rfbClient* client);
 
+#if(defined __cplusplus)
+}
+#endif
+
 #endif