Avoids C linkage in geeqie files now that we're trying to compile everything as C++

zonedetect.h and whereami.h are external libraries, so they're left as-is.

diff --git a/src/cellrenderericon.h b/src/cellrenderericon.h
index 62611ea..71ad610 100644 (file)
--- a/src/cellrenderericon.h
+++ b/src/cellrenderericon.h
@@ -20,10 +20,6 @@
 #ifndef __GQV_CELL_RENDERER_ICON_H__
 #define __GQV_CELL_RENDERER_ICON_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #define TOGGLE_WIDTH 13
 #define TOGGLE_SPACING 16
 
@@ -81,9 +77,5 @@ struct _GQvCellRendererIconClass
 GType            gqv_cell_renderer_icon_get_type(void);
 GtkCellRenderer *gqv_cell_renderer_icon_new(void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #endif /* __GQV_CELL_RENDERER_ICON_H__ */
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */

diff --git a/src/exiv2.cc b/src/exiv2.cc
index 145ce30..305061b 100644 (file)
--- a/src/exiv2.cc
+++ b/src/exiv2.cc
@@ -52,7 +52,6 @@
 #define EXV_PACKAGE "exiv2"
 #endif
 
-extern "C" {
 #include <glib.h>
 
 #include "main.h"
@@ -62,7 +61,6 @@ extern "C" {
 #include "ui-fileops.h"
 
 #include "misc.h"
-}
 
 typedef struct _AltKey AltKey;
 
@@ -286,9 +284,7 @@ public:
        }
 };
 
-extern "C" {
 static void _ExifDataProcessed_update_xmp(gpointer key, gpointer value, gpointer data);
-}
 
 // This allows read-write access to the metadata
 struct _ExifDataProcessed : public _ExifData
@@ -442,7 +438,6 @@ public:
 
 
 
-extern "C" {
 
 
 void exif_init(void)
@@ -1244,7 +1239,6 @@ void exif_free_preview(guchar *buf)
 }
 #endif
 
-}
 #if !EXIV2_TEST_VERSION(0,17,90)
 
 /* This is a dirty hack to support raw file preview, bassed on
@@ -1279,7 +1273,7 @@ struct _UnmapData
 
 static GList *exif_unmap_list = 0;
 
-extern "C" guchar *exif_get_preview(ExifData *exif, guint *data_len, gint requested_width, gint requested_height)
+guchar *exif_get_preview(ExifData *exif, guint *data_len, gint requested_width, gint requested_height)
 {
        unsigned long offset;