From 74c19c8dc761952a7be7b4622ece0795c286f344 Mon Sep 17 00:00:00 2001
From: William Skaggs <weskaggs@src.gnome.org>
Date: Wed, 24 May 2006 20:16:25 +0000
Subject: [PATCH] Bill Skaggs  <weskaggs@primate.ucdavis.edu>

	* plug-ins/jpeg/gimpexif.c
	* plug-ins/jpeg/jpeg-load.c
	* plug-ins/jpeg/jpeg-save.h
	* plug-ins/jpeg/jpeg.c
	* plug-ins/jpeg/jpeg.h: fix multiply-defined linker symbols;
	fixes bug #342456.
---
 ChangeLog                 |  9 +++++++++
 plug-ins/jpeg/gimpexif.c  |  2 ++
 plug-ins/jpeg/jpeg-load.c |  3 +++
 plug-ins/jpeg/jpeg-save.h |  6 +++---
 plug-ins/jpeg/jpeg.c      |  7 +++++++
 plug-ins/jpeg/jpeg.h      | 16 ++++++++--------
 6 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2e302a2ebb..b6c550bef4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-05-24  Bill Skaggs  <weskaggs@primate.ucdavis.edu>
+
+	* plug-ins/jpeg/gimpexif.c
+	* plug-ins/jpeg/jpeg-load.c
+	* plug-ins/jpeg/jpeg-save.h
+	* plug-ins/jpeg/jpeg.c
+	* plug-ins/jpeg/jpeg.h: fix multiply-defined linker symbols;
+	fixes bug #342456.
+
 2006-05-24  Michael Natterer  <mitch@gimp.org>
 
 	* plug-ins/script-fu/scripts/copy-visible.scm: use canonical
diff --git a/plug-ins/jpeg/gimpexif.c b/plug-ins/jpeg/gimpexif.c
index 50a845ecc6..a0c78c4b86 100644
--- a/plug-ins/jpeg/gimpexif.c
+++ b/plug-ins/jpeg/gimpexif.c
@@ -34,6 +34,8 @@
 
 #include "gimpexif.h"
 
+ExifData *exif_data;
+
 /*
  * gimp_metadata_store_exif:
  * @image_ID:    the GIMP image to work on.
diff --git a/plug-ins/jpeg/jpeg-load.c b/plug-ins/jpeg/jpeg-load.c
index 5f1b7136f7..3a4d2b92fd 100644
--- a/plug-ins/jpeg/jpeg-load.c
+++ b/plug-ins/jpeg/jpeg-load.c
@@ -40,6 +40,9 @@
 #include "jpeg-icc.h"
 #include "jpeg-load.h"
 
+gint32 volatile  image_ID_global;
+GimpDrawable    *drawable_global;
+gint32           layer_ID_global;
 
 gint32
 load_image (const gchar *filename,
diff --git a/plug-ins/jpeg/jpeg-save.h b/plug-ins/jpeg/jpeg-save.h
index a485e55975..7f0534ea26 100644
--- a/plug-ins/jpeg/jpeg-save.h
+++ b/plug-ins/jpeg/jpeg-save.h
@@ -48,10 +48,10 @@ typedef struct
   gboolean save_xmp;
 } JpegSaveVals;
 
-JpegSaveVals     jsvals;
+extern JpegSaveVals     jsvals;
 
-gint32           orig_image_ID_global;
-gint32           drawable_ID_global;
+extern gint32           orig_image_ID_global;
+extern gint32           drawable_ID_global;
 
 gboolean  save_image          (const gchar      *filename,
                                gint32            image_ID,
diff --git a/plug-ins/jpeg/jpeg.c b/plug-ins/jpeg/jpeg.c
index af736129c1..4b9db1eeda 100644
--- a/plug-ins/jpeg/jpeg.c
+++ b/plug-ins/jpeg/jpeg.c
@@ -50,6 +50,13 @@ static void  run   (const gchar      *name,
                     gint             *nreturn_vals,
                     GimpParam       **return_vals);
 
+gboolean      undo_touched;
+gboolean      load_interactive;
+gchar        *image_comment;
+gint32        display_ID;
+JpegSaveVals  jsvals;
+gint32        orig_image_ID_global;
+gint32        drawable_ID_global;
 
 const GimpPlugInInfo PLUG_IN_INFO =
 {
diff --git a/plug-ins/jpeg/jpeg.h b/plug-ins/jpeg/jpeg.h
index 344ab4f344..93c4855f1f 100644
--- a/plug-ins/jpeg/jpeg.h
+++ b/plug-ins/jpeg/jpeg.h
@@ -41,13 +41,13 @@ typedef struct my_error_mgr
 } *my_error_ptr;
 
 
-gint32 volatile  image_ID_global;
-gint32           layer_ID_global;
-GimpDrawable    *drawable_global;
-gboolean         undo_touched;
-gboolean         load_interactive;
-gint32           display_ID;
-gchar           *image_comment;
+extern gint32 volatile  image_ID_global;
+extern gint32           layer_ID_global;
+extern GimpDrawable    *drawable_global;
+extern gboolean         undo_touched;
+extern gboolean         load_interactive;
+extern gint32           display_ID;
+extern gchar           *image_comment;
 
 gint32    load_image                    (const gchar   *filename,
                                          GimpRunMode    runmode,
@@ -62,7 +62,7 @@ void      my_output_message             (j_common_ptr   cinfo);
 
 #ifdef HAVE_EXIF
 
-ExifData *exif_data;
+extern ExifData *exif_data;
 
 gint32    load_thumbnail_image          (const gchar   *filename,
                                          gint          *width,