[GNUnet-SVN] r1401 - Extractor/src/plugins/exiv2

[grothoff]

Author: grothoff
Date: 2005-07-11 12:09:17 -0700 (Mon, 11 Jul 2005)
New Revision: 1401

Modified:
   Extractor/src/plugins/exiv2/Makefile.am
   Extractor/src/plugins/exiv2/exv_msvc.h
Log:
update

Modified: Extractor/src/plugins/exiv2/Makefile.am
===================================================================
--- Extractor/src/plugins/exiv2/Makefile.am     2005-07-11 19:08:47 UTC (rev 
1400)
+++ Extractor/src/plugins/exiv2/Makefile.am     2005-07-11 19:09:17 UTC (rev 
1401)
@@ -21,7 +21,7 @@
   $(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 \

Modified: Extractor/src/plugins/exiv2/exv_msvc.h
===================================================================
--- Extractor/src/plugins/exiv2/exv_msvc.h      2005-07-11 19:08:47 UTC (rev 
1400)
+++ Extractor/src/plugins/exiv2/exv_msvc.h      2005-07-11 19:09:17 UTC (rev 
1401)
@@ -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