[libexif-cvs] libexif/libexif/canon exif-canon-entry.c,1.1,1.2 exif-canon-note.c,1.2,1.3 exif-canon-tag.c,1.2,1.3

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

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

Modified Files:
	exif-canon-entry.c exif-canon-note.c exif-canon-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-canon-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/exif-canon-entry.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- exif-canon-entry.c	21 Feb 2002 09:42:49 -0000	1.1
+++ exif-canon-entry.c	22 Nov 2002 17:19:20 -0000	1.2
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include "exif-canon-entry.h"
 
 #include <stdlib.h>

Index: exif-canon-note.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/exif-canon-note.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exif-canon-note.c	21 Feb 2002 09:55:22 -0000	1.2
+++ exif-canon-note.c	22 Nov 2002 17:19:20 -0000	1.3
@@ -18,11 +18,12 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include "exif-canon-note.h"
 
 #include <stdlib.h>
 #include <string.h>
+
 
 static void
 exif_canon_note_free (ExifNote *n)

Index: exif-canon-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/exif-canon-tag.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exif-canon-tag.c	22 Nov 2002 15:20:01 -0000	1.2
+++ exif-canon-tag.c	22 Nov 2002 17:19:20 -0000	1.3
@@ -18,29 +18,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include "exif-canon-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 {
 	ExifCanonTag tag;