Require MinGW 3 or greater, as a side effect cleanup some defines

    * ACE/ace/config-win32-borland.h:
    * ACE/ace/config-win32-common.h:
    * ACE/ace/config-win32-mingw.h:
    * ACE/ace/config-win32-mingw64.h:

4 files changed, 29 insertions, 57 deletions

diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h
index 9b5d0058bca..c15a8669558 100644
--- a/ACE/ace/config-win32-borland.h
+++ b/ACE/ace/config-win32-borland.h
@@ -91,10 +91,6 @@
 #define ACE_LACKS_WCSRTOMBS
 #define ACE_LACKS_SET_ABORT_BEHAVIOR
 
-#undef ACE_LACKS_STRUCT_DIR
-#undef ACE_LACKS_CLOSEDIR
-#undef ACE_LACKS_OPENDIR
-#undef ACE_LACKS_READDIR
 #undef ACE_LACKS_REWINDDIR
 
 #define ACE_HAS_WOPENDIR
diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h
index e3eb100dc5c..7a4ac9282b9 100644
--- a/ACE/ace/config-win32-common.h
+++ b/ACE/ace/config-win32-common.h
@@ -599,10 +599,6 @@
 
 #define ACE_SIZEOF_WCHAR 2
 #define ACE_HAS_MUTEX_TIMEOUTS
-#define ACE_LACKS_STRUCT_DIR
-#define ACE_LACKS_OPENDIR
-#define ACE_LACKS_CLOSEDIR
-#define ACE_LACKS_READDIR
 #define ACE_LACKS_ALPHASORT
 #define ACE_LACKS_MKSTEMP
 #define ACE_LACKS_LSTAT
diff --git a/ACE/ace/config-win32-mingw.h b/ACE/ace/config-win32-mingw.h
index 5216f0d7e8e..61f4b833632 100644
--- a/ACE/ace/config-win32-mingw.h
+++ b/ACE/ace/config-win32-mingw.h
@@ -26,8 +26,8 @@
 
 #define ACE_HAS_USER_MODE_MASKS
 
-#if (__MINGW32_MAJOR_VERSION < 2)
-#  error You need a newer version (>= 2.0) of mingw32/w32api
+#if (__MINGW32_MAJOR_VERSION < 3)
+#  error You need a newer version (>= 3.0) of mingw32/w32api
 #endif
 
 // In strict ANSI mode (default when using --std=c++0x) the fileno()
@@ -36,18 +36,10 @@
 # define ACE_FILENO_EQUIVALENT ::_fileno
 #endif
 
-#if (__MINGW32_MAJOR_VERSION >= 3)
-#  define ACE_HAS_SSIZE_T
-#  undef ACE_LACKS_STRUCT_DIR
-#  undef ACE_LACKS_OPENDIR
-#  undef ACE_LACKS_CLOSEDIR
-#  undef ACE_LACKS_READDIR
-#  undef ACE_LACKS_TELLDIR
-#  undef ACE_LACKS_SEEKDIR
-#  undef ACE_LACKS_REWINDDIR
-#else
-#  define ACE_LACKS_DIRENT_H
-#endif
+#define ACE_HAS_SSIZE_T
+#undef ACE_LACKS_TELLDIR
+#undef ACE_LACKS_SEEKDIR
+#undef ACE_LACKS_REWINDDIR
 
 #if (__MINGW32_MAJOR_VERSION > 3) || ((__MINGW32_MAJOR_VERSION == 3) && (__MINGW32_MINOR_VERSION >= 15))
 # undef ACE_LACKS_USECONDS_T
diff --git a/ACE/ace/config-win32-mingw64.h b/ACE/ace/config-win32-mingw64.h
index 939006a263f..1f3231b0e56 100644
--- a/ACE/ace/config-win32-mingw64.h
+++ b/ACE/ace/config-win32-mingw64.h
@@ -36,8 +36,8 @@
 
 #define ACE_HAS_USER_MODE_MASKS
 
-#if (!defined (__MINGW64_VERSION_MAJOR) || (__MINGW64_VERSION_MAJOR < 2))
-# error You need a newer version (>= 2.0) of mingw32/w32api
+#if (!defined (__MINGW64_VERSION_MAJOR) || (__MINGW64_VERSION_MAJOR < 3))
+# error You need a newer version (>= 3.0) of mingw32/w32api
 #endif
 
 #include <stdio.h>
@@ -45,51 +45,39 @@
 #if defined (fileno)
 # undef fileno
 #endif
-#if (__MINGW64_VERSION_MAJOR >= 3)
 # define ACE_FILENO_EQUIVALENT ::_fileno
 
 // Latest version of MingW64 (GCC 4.8.2) with Win32 threading
 // defines a 'pthread_sigmask' macro when including signal.h.
 // We have to remove that one since ACE declares a (non-functional)
 // pthread_sigmask method in ACE_OS.
-# include <signal.h>
-# if defined (pthread_sigmask)
-#   undef pthread_sigmask
-# endif
+#include <signal.h>
+#if defined (pthread_sigmask)
+#  undef pthread_sigmask
 #endif
 
-#if (__MINGW64_VERSION_MAJOR >= 2)
+#define ACE_HAS_SSIZE_T
+#undef ACE_LACKS_TELLDIR
+#undef ACE_LACKS_SEEKDIR
+#undef ACE_LACKS_REWINDDIR
+#undef ACE_LACKS_USECONDS_T
 
-# define ACE_HAS_SSIZE_T
-# undef ACE_LACKS_STRUCT_DIR
-# undef ACE_LACKS_OPENDIR
-# undef ACE_LACKS_CLOSEDIR
-# undef ACE_LACKS_READDIR
-# undef ACE_LACKS_TELLDIR
-# undef ACE_LACKS_SEEKDIR
-# undef ACE_LACKS_REWINDDIR
-# undef ACE_LACKS_USECONDS_T
+#define ACE_HAS_POSIX_TIME 1
+#define ACE_LACKS_TIMESPEC_T 1
+#define ACE_HAS_NONCONST_SELECT_TIMEVAL 1
 
-# define ACE_HAS_POSIX_TIME 1
-# define ACE_LACKS_TIMESPEC_T 1
-# define ACE_HAS_NONCONST_SELECT_TIMEVAL 1
-
-# if defined (ACE_HAS_QOS) && !defined (ACE_HAS_WINSOCK2_GQOS)
-#   define ACE_HAS_WINSOCK2_GQOS
-# endif
-
-# if defined (WIN64) || defined (__WIN64__)
-#   define ACE_LACKS_INLINE_ASSEMBLY
-# endif
+#if defined (ACE_HAS_QOS) && !defined (ACE_HAS_WINSOCK2_GQOS)
+#  define ACE_HAS_WINSOCK2_GQOS
+#endif
 
-# include <stdlib.h>
-# if defined (strtod)
-#  undef strtod
-# endif
+#if defined (WIN64) || defined (__WIN64__)
+#  define ACE_LACKS_INLINE_ASSEMBLY
+#endif
 
-#else
-#  define ACE_LACKS_DIRENT_H
-#endif // __MINGW64_VERSION_MAJOR >= 3
+#include <stdlib.h>
+#if defined (strtod)
+# undef strtod
+#endif
 
 #undef ACE_HAS_WTOF