markup all headers with extern "C" wrappers.

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@11956 67ed7778-7388-44ab-90cf-0a291f65f57c

3 files changed, 41 insertions, 0 deletions

diff --git a/gphoto2/gphoto2-camera.h b/gphoto2/gphoto2-camera.h
index d79e5044f..2b785fd48 100644
--- a/gphoto2/gphoto2-camera.h
+++ b/gphoto2/gphoto2-camera.h
@@ -26,6 +26,10 @@
 #ifndef __GPHOTO2_CAMERA_H__
 #define __GPHOTO2_CAMERA_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /**
  * \brief Object representing a camera attached to the system.
  *
@@ -38,6 +42,9 @@
  * The details of the Camera object are internal.
  */
 typedef struct _Camera Camera;
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
 
 
 #include <gphoto2/gphoto2-abilities-list.h>
@@ -47,6 +54,10 @@ typedef struct _Camera Camera;
 #include <gphoto2/gphoto2-filesys.h>
 #include <gphoto2/gphoto2-result.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /** 
  * \brief CameraText structure used in various functions.
  *
@@ -386,5 +397,9 @@ int          gp_camera_start_timeout     (Camera *camera, unsigned int timeout,
 void         gp_camera_stop_timeout      (Camera *camera, unsigned int id);
 
 /**@}*/
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 
 #endif /* __GPHOTO2_CAMERA_H__ */
diff --git a/gphoto2/gphoto2-setting.h b/gphoto2/gphoto2-setting.h
index cbf27f8c0..1241b039a 100644
--- a/gphoto2/gphoto2-setting.h
+++ b/gphoto2/gphoto2-setting.h
@@ -24,7 +24,15 @@
 #ifndef __GPHOTO2_SETTING_H__
 #define __GPHOTO2_SETTING_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 int gp_setting_set (char *id, char *key, char *value);
 int gp_setting_get (char *id, char *key, char *value);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* __GPHOTO2_SETTING_H__ */
diff --git a/gphoto2/gphoto2-widget.h b/gphoto2/gphoto2-widget.h
index 263a07506..39e4af643 100644
--- a/gphoto2/gphoto2-widget.h
+++ b/gphoto2/gphoto2-widget.h
@@ -26,11 +26,25 @@
 
 #include <gphoto2/gphoto2-context.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /** \brief internal structure please use the accessors. */
 typedef struct _CameraWidget CameraWidget;
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
+
 #include <gphoto2/gphoto2-camera.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /**
  * \brief Type of the widget to be created.
  *
@@ -109,4 +123,8 @@ int	gp_widget_get_choice     (CameraWidget *widget, int choice_number,
 int	gp_widget_changed        (CameraWidget *widget);
 int     gp_widget_set_changed    (CameraWidget *widget, int changed);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* __GPHOTO2_WIDGET_H__ */