[libexif-cvs] libexif/libexif/olympus exif-olympus-entry.c,1.3,1.4 exif-olympus-note.c,1.2,1.3 exif-olympus-tag.c,1.2,1.3

[<as...@us...>]

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sc8-pr-cvs1:/tmp/cvs-serv22079/libexif/olympus

Modified Files:
	exif-olympus-entry.c exif-olympus-note.c exif-olympus-tag.c 
Log Message:
- clean the headers of gettext macros
- generic clean of the headers: use "" instead of <> to first
  look at local sources, not system ones
- rename exif-i18n.h by generic i18n.h


Index: exif-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-olympus-entry.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- exif-olympus-entry.c	22 Nov 2002 15:20:01 -0000	1.3
+++ exif-olympus-entry.c	22 Nov 2002 17:19:20 -0000	1.4
@@ -18,34 +18,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
+#include "exif-format.h"
 #include "exif-olympus-entry.h"
+#include "exif-utils.h"
+#include "i18n.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-#include <libexif/exif-format.h>
-#include <libexif/exif-utils.h>
-
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 struct _ExifOlympusEntryPrivate {
 	unsigned int ref_count;

Index: exif-olympus-note.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-olympus-note.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exif-olympus-note.c	26 Feb 2002 08:31:35 -0000	1.2
+++ exif-olympus-note.c	22 Nov 2002 17:19:21 -0000	1.3
@@ -18,15 +18,14 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
+#include "exif-byte-order.h"
 #include "exif-olympus-note.h"
+#include "exif-utils.h"
 
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-
-#include <libexif/exif-byte-order.h>
-#include <libexif/exif-utils.h>
 
 #define DEBUG
 

Index: exif-olympus-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-olympus-tag.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exif-olympus-tag.c	22 Nov 2002 15:20:01 -0000	1.2
+++ exif-olympus-tag.c	22 Nov 2002 17:19:21 -0000	1.3
@@ -18,29 +18,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include "exif-olympus-tag.h"
+#include "i18n.h"
 
 #include <stdlib.h>
-
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 static struct {
 	ExifOlympusTag tag;