[libexif-cvs] libexif/libexif exif-data.c, 1.86, 1.87 exif-loader.c, 1.23, 1.24 exif-utils.h, 1.14, 1.15

[Jan P. <pa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1688

Modified Files:
	exif-data.c exif-loader.c exif-utils.h 
Log Message:
#definition of MAX moved to exif-utils.h where we already have MIN


Index: exif-utils.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-utils.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -d -r1.14 -r1.15
--- exif-utils.h	19 Feb 2006 11:08:35 -0000	1.14
+++ exif-utils.h	3 Oct 2006 19:41:36 -0000	1.15
@@ -72,6 +72,9 @@ void exif_array_set_byte_order (ExifForm
 #undef  MIN
 #define MIN(a, b)  (((a) < (b)) ? (a) : (b))
 
+#undef  MAX
+#define MAX(a, b)  (((a) > (b)) ? (a) : (b))
+
 /* For compatibility with older versions */
 #define EXIF_TAG_SUBSEC_TIME EXIF_TAG_SUB_SEC_TIME
 

Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -d -r1.86 -r1.87
--- exif-data.c	19 Jan 2006 07:40:25 -0000	1.86
+++ exif-data.c	3 Oct 2006 19:41:36 -0000	1.87
@@ -37,9 +37,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#undef MAX
-#define MAX(a, b)  (((a) > (b)) ? (a) : (b))
-
 #if defined(__WATCOMC__) || defined(_MSC_VER)
 #      define strncasecmp strnicmp
 #endif

Index: exif-loader.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-loader.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -d -r1.23 -r1.24
--- exif-loader.c	27 Sep 2006 09:33:58 -0000	1.23
+++ exif-loader.c	3 Oct 2006 19:41:36 -0000	1.24
@@ -21,6 +21,7 @@
 #include <config.h>
 
 #include <libexif/exif-loader.h>
+#include <libexif/exif-utils.h>
 #include <libexif/i18n.h>
 
 #include <stdlib.h>
@@ -40,9 +41,6 @@
 #undef JPEG_MARKER_COM
 #define JPEG_MARKER_COM 0xfe
 
-#undef MAX
-#define MAX(a, b)  (((a) > (b)) ? (a) : (b))
-
 typedef enum {
 	EL_READ = 0,
 	EL_READ_SIZE_BYTE_24,