now assume MinGW does not have dirent.h (actually have it but without opendir functio...

diff --git a/CHANGES b/CHANGES
index 7f9995e6828f155c3f43ecc0985e136ae1e01ffc..5744df823a296f540487a2e9bfae1db24d9b35e8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ What's New for OpenJPEG
 + : added
 
 March 4, 2011
+* [antonin] now assume MinGW does not have dirent.h (actually have it but without opendir function). Fixed also a WIN32 check in jp3d/libjp3dvm/openjpeg3d.h.
 ! [antonin] updated autotools files to improve build and install procedures (credit to Vincent Torri).
 
 February 17, 2011

diff --git a/codec/windirent.h b/codec/windirent.h
index 037569df97451dac4fe04978d69aa38a09099069..6bcc7787e2c1cb455dd6fe2f777b8b995dba4411 100644 (file)
--- a/codec/windirent.h
+++ b/codec/windirent.h
@@ -107,6 +107,8 @@
 #if !defined(HAVE_DIRENT_H) && !defined(HAVE_DIRECT_H) && !defined(HAVE_SYS_DIR_H) && !defined(HAVE_NDIR_H) && !defined(HAVE_SYS_NDIR_H) && !defined(HAVE_DIR_H)\r
 # if defined(_MSC_VER)                         /* Microsoft C/C++ */\r
     /* no dirent.h */\r
+# elif defined(__MINGW32__)                    /* MinGW */\r
+    /* no dirent.h */\r
 # elif defined(__BORLANDC__)                   /* Borland C/C++ */\r
 #   define HAVE_DIRENT_H\r
 #   define VOID_CLOSEDIR\r

diff --git a/jp3d/codec/windirent.h b/jp3d/codec/windirent.h
index a67e58748c6ab85af17a3ac28e62a3ebe7c35519..72b38cea1c0a930219a7a62b36ec1618bd60f7f2 100644 (file)
--- a/jp3d/codec/windirent.h
+++ b/jp3d/codec/windirent.h
@@ -106,6 +106,8 @@
 #if !defined(HAVE_DIRENT_H) && !defined(HAVE_DIRECT_H) && !defined(HAVE_SYS_DIR_H) && !defined(HAVE_NDIR_H) && !defined(HAVE_SYS_NDIR_H) && !defined(HAVE_DIR_H)
 # if defined(_MSC_VER)                         /* Microsoft C/C++ */
     /* no dirent.h */
+# elif defined(__MINGW32__)                    /* MinGW */
+    /* no dirent.h */
 # elif defined(__BORLANDC__)                   /* Borland C/C++ */
 #   define HAVE_DIRENT_H
 #   define VOID_CLOSEDIR

diff --git a/jp3d/libjp3dvm/openjpeg3d.h b/jp3d/libjp3dvm/openjpeg3d.h
index fdfe28347332bf7b8b073ab72e6cbdc335334c49..e6829d91f90dda66a281c9c93c1740c173dd70a9 100755 (executable)
--- a/jp3d/libjp3dvm/openjpeg3d.h
+++ b/jp3d/libjp3dvm/openjpeg3d.h
@@ -37,7 +37,7 @@
 ==========================================================\r
 */\r
 \r
-#if defined(OPJ_STATIC) || !(defined(WIN32) || defined(__WIN32__))\r
+#if defined(OPJ_STATIC) || !defined(_WIN32)\r
 #define OPJ_API\r
 #define OPJ_CALLCONV\r
 #else\r
@@ -50,7 +50,7 @@ that uses this DLL. This way any other project whose source files include this f
 OPJ_API functions as being imported from a DLL, wheras this DLL sees symbols\r
 defined with this macro as being exported.\r
 */\r
-#ifdef OPJ_EXPORTS\r
+#if defined(OPJ_EXPORTS) || defined(DLL_EXPORT)\r
 #define OPJ_API __declspec(dllexport)\r
 #else\r
 #define OPJ_API __declspec(dllimport)\r