From 91ce5625b5a60e8675a879b3dc5a9ddd8b01a53f Mon Sep 17 00:00:00 2001
From: Antonin Descampe <antonin@gmail.com>
Date: Fri, 4 Mar 2011 11:21:45 +0000
Subject: [PATCH] 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.

---
 CHANGES                     | 1 +
 codec/windirent.h           | 2 ++
 jp3d/codec/windirent.h      | 2 ++
 jp3d/libjp3dvm/openjpeg3d.h | 4 ++--
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 7f9995e6..5744df82 100644
--- 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 037569df..6bcc7787 100644
--- 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)
 # 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/codec/windirent.h b/jp3d/codec/windirent.h
index a67e5874..72b38cea 100644
--- 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 fdfe2834..e6829d91 100755
--- a/jp3d/libjp3dvm/openjpeg3d.h
+++ b/jp3d/libjp3dvm/openjpeg3d.h
@@ -37,7 +37,7 @@
 ==========================================================
 */
 
-#if defined(OPJ_STATIC) || !(defined(WIN32) || defined(__WIN32__))
+#if defined(OPJ_STATIC) || !defined(_WIN32)
 #define OPJ_API
 #define OPJ_CALLCONV
 #else
@@ -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
 defined with this macro as being exported.
 */
-#ifdef OPJ_EXPORTS
+#if defined(OPJ_EXPORTS) || defined(DLL_EXPORT)
 #define OPJ_API __declspec(dllexport)
 #else
 #define OPJ_API __declspec(dllimport)