ChangeLogTag: Thu Aug 01 07:33:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 36 insertions, 51 deletions

diff --git a/ChangeLog b/ChangeLog
index de1cc2d7d37..c9c72ffc89c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
+Thu Aug 01 07:34:12 UTC 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-win32-mingw.h:
+          Made the definition of the missing parts of the Win32api of MingW
+          dependent on the version of the w32api instead of our own defines.
+          This way we automically define the missing things when needed. Thanks
+          to Craig for suggesting this.
+
 Wed Jul 31 23:39:27 UTC 2002  Craig Rodrigues  <crodrigu@bbn.com>
 
-	* etc/*.doxygen: Change DOT_PATH from /usr/local/bin/ to 
+	* etc/*.doxygen: Change DOT_PATH from /usr/local/bin/ to
 	  empty, forcing doxygen to look for the dot program in PATH.
 	  This eliminates warnings in the Doxygen nightly build.
 
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index de1cc2d7d37..c9c72ffc89c 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,6 +1,14 @@
+Thu Aug 01 07:34:12 UTC 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-win32-mingw.h:
+          Made the definition of the missing parts of the Win32api of MingW
+          dependent on the version of the w32api instead of our own defines.
+          This way we automically define the missing things when needed. Thanks
+          to Craig for suggesting this.
+
 Wed Jul 31 23:39:27 UTC 2002  Craig Rodrigues  <crodrigu@bbn.com>
 
-	* etc/*.doxygen: Change DOT_PATH from /usr/local/bin/ to 
+	* etc/*.doxygen: Change DOT_PATH from /usr/local/bin/ to
 	  empty, forcing doxygen to look for the dot program in PATH.
 	  This eliminates warnings in the Doxygen nightly build.
 
diff --git a/ace/config-win32-mingw.h b/ace/config-win32-mingw.h
index df5f7c83796..db5d8cee478 100644
--- a/ace/config-win32-mingw.h
+++ b/ace/config-win32-mingw.h
@@ -32,6 +32,7 @@
 #include "ace/config-g++-common.h"
 
 #include /**/ <_mingw.h>
+#include /**/ <w32api.h>
 
 #define ACE_LACKS_MODE_MASKS
 #define ACE_HAS_USER_MODE_MASKS
@@ -60,63 +61,31 @@
 
 #define ACE_ENDTHREADEX(STATUS)  ::_endthreadex ((DWORD) (STATUS))
 
-// The MingW32 w32api version 1.4 and 1.5 don't define this union but we need
-// it in the Win32_Asynch_IO.cpp
-#if defined (ACE_MINGW_LACKS_FILE_SEGMENT_ELEMENT)
-
-// Define stuff for PVOID64
-#if !defined(_MAC) && (defined(_M_MRX000) || defined(_M_ALPHA) || defined(_M_IA64)) && (_MSC_VER >= 1100) && !(defined(MIDL_PASS) || defined(RC_INVOKED))
-#define POINTER_64 __ptr64
-typedef unsigned __int64 POINTER_64_INT;
-#if defined(_AXP64_)
-#define POINTER_32 __ptr32
-#else
-#define POINTER_32
-#endif
-#else
-#if defined(_MAC) && defined(_MAC_INT_64)
-#define POINTER_64 __ptr64
-typedef unsigned __int64 POINTER_64_INT;
-#else
-#define POINTER_64
-typedef unsigned long POINTER_64_INT;
-#endif
-#define POINTER_32
-#endif
+#if ( __W32API_MAJOR_VERSION < 1) || ((__W32API_MAJOR_VERSION == 1) && (__W32API_MINOR_VERSION <= 5))
 
-typedef void * POINTER_64 PVOID64;
+// The MingW32 w32api version 1.50 and lower don't define these types and methods
+// but we need it in the Win32_Asynch_IO.cpp
+
+typedef void *PVOID,*LPVOID;
+
+/* FIXME for __WIN64 */
+#ifndef  __ptr64
+#define __ptr64
+#endif
+typedef void* __ptr64 PVOID64;
 
 //
 // Define segement buffer structure for scatter/gather read/write.
 //
 typedef union _FILE_SEGMENT_ELEMENT {
-    PVOID64 Buffer;
-    ULONGLONG Alignment;
+           PVOID64 Buffer;
+           ULONGLONG Alignment;
 }FILE_SEGMENT_ELEMENT, *PFILE_SEGMENT_ELEMENT;
-#endif
 
-// The MingW32 w32api version 1.4 and 1.5 don't define these methods but we need
-// it in the Win32_Asynch_IO.cpp
-#if defined (ACE_MINGW_LACKS_READWRITE_FILESCATTER)
-BOOL
-WINAPI
-ReadFileScatter(
-    IN HANDLE hFile,
-    IN FILE_SEGMENT_ELEMENT aSegmentArray[],
-    IN DWORD nNumberOfBytesToRead,
-    IN LPDWORD lpReserved,
-    IN LPOVERLAPPED lpOverlapped
-    );
-
-BOOL
-WINAPI
-WriteFileGather(
-    IN HANDLE hFile,
-    OUT FILE_SEGMENT_ELEMENT aSegmentArray[],
-    IN DWORD nNumberOfBytesToWrite,
-    IN LPDWORD lpReserved,
-    IN LPOVERLAPPED lpOverlapped
-    );
+
+BOOL WINAPI ReadFileScatter(HANDLE,FILE_SEGMENT_ELEMENT[],DWORD,LPDWORD,LPOVERLAPPED);
+
+BOOL WINAPI WriteFileGather(HANDLE,FILE_SEGMENT_ELEMENT[],DWORD,LPDWORD,LPOVERLAPPED);
 #endif
 
 #include "ace/post.h"