diff options
-rw-r--r-- | ACE/ChangeLog | 5 | ||||
-rw-r--r-- | ACE/ace/config-win32-cegcc.h | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 8cd9f58a49f..31820ae6e15 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Mon Apr 20 17:26:06 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-win32-cegcc.h: + Include _mingw.h and check the MinGW version + Mon Apr 20 17:16:06 UTC 2009 Marcel Smit <msmit@remedy.nl> * ace/config-win32-cegcc.h: diff --git a/ACE/ace/config-win32-cegcc.h b/ACE/ace/config-win32-cegcc.h index 0223be3e766..85eeb518318 100644 --- a/ACE/ace/config-win32-cegcc.h +++ b/ACE/ace/config-win32-cegcc.h @@ -37,6 +37,11 @@ #include /**/ <cegcc.h> #include /**/ <w32api.h> +#include /**/ <_mingw.h> + +#if (__MINGW32_MAJOR_VERSION > 3) || ((__MINGW32_MAJOR_VERSION == 3) && (__MINGW32_MINOR_VERSION >= 15)) +# undef ACE_LACKS_USECONDS_T +#endif #define ACE_HAS_USER_MODE_MASKS |