libextractor

commit d81b2079e98eeee9476f9b1e23fe657849d6b294
parent bfa99ef8971f5958133059b66d164d4ecec149c2
Author: Christian Grothoff <christian@grothoff.org>
Date:   Mon, 11 Jul 2005 19:09:17 +0000

update

Diffstat:
M
src/plugins/exiv2/Makefile.am
 | 
2
+-
M
src/plugins/exiv2/exv_msvc.h
 | 
16
+++++++++++-----

2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/plugins/exiv2/Makefile.am b/src/plugins/exiv2/Makefile.am
@@ -21,7 +21,7 @@ libextractor_exiv2_la_LIBADD = \
   $(top_builddir)/src/main/libextractor.la
 
 libextractor_exiv2_la_SOURCES = \
-exiv2extractor.cc exv_conf.h \
+exiv2extractor.cc exv_conf.h exv_msvc.h \
 basicio.cpp \
 basicio.hpp \
 canonmn.cpp \
diff --git a/src/plugins/exiv2/exv_msvc.h b/src/plugins/exiv2/exv_msvc.h
@@ -1,11 +1,12 @@
 #include "config.h"
-#include "plibc.h"
-
-#ifdef _MSC_VER
 
 #define SUPPRESS_WARNINGS 1
 
-/* Define to the address where bug reports for this package should be sent. */
+/* Define to 1 if you have the <unistd.h> header file. */
+#define EXV_HAVE_UNISTD_H HAVE_UNISTD_H
+
+/* Define to the address where bug reports for this package should be
+   sent. */
 #define EXV_PACKAGE_BUGREPORT PACKAGE_BUGREPORT
 
 /* Define to the full name of this package. */
@@ -21,4 +22,9 @@
 #define EXV_SEPERATOR_STR DIR_SEPARATOR_STR
 #define EXV_SEPERATOR_CHR DIR_SEPARATOR
 
-#endif /* _MSC_VER */
+#if defined __CYGWIN32__ && !defined __CYGWIN__
+   /* For backwards compatibility with Cygwin b19 and
+      earlier, we define __CYGWIN__ here, so that
+      we can rely on checking just for that macro. */
+#define __CYGWIN__  __CYGWIN32__
+#endif