diff options
| author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2012-01-16 09:02:21 +0000 |
|---|---|---|
| committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2012-01-16 09:02:21 +0000 |
| commit | 9aa987bb75bfee63305889cc7537166f784615d6 (patch) | |
| tree | 171f68d39d11f5d6d978f12c01951ab98c504ea7 /ACE/ace | |
| parent | b148dcd7668070633d419edcc99f921c7e9d8b0a (diff) | |
| download | ATCD-9aa987bb75bfee63305889cc7537166f784615d6.tar.gz | |
Mon Jan 16 09:01:20 UTC 2012 Martin Corino <mcorino@remedy.nl>
* ace/config-win32-mingw.h:
Fixed incorrectly placed macro test.
Diffstat (limited to 'ACE/ace')
| -rw-r--r-- | ACE/ace/config-win32-mingw.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ACE/ace/config-win32-mingw.h b/ACE/ace/config-win32-mingw.h index 8158f834067..2c1979ee458 100644 --- a/ACE/ace/config-win32-mingw.h +++ b/ACE/ace/config-win32-mingw.h @@ -21,17 +21,6 @@ # error You do not seem to be using mingw32 #endif -#include "ace/config-g++-common.h" - -#include /**/ <_mingw.h> -#include /**/ <w32api.h> - -#define ACE_HAS_USER_MODE_MASKS - -#if (__MINGW32_MAJOR_VERSION < 2) && (__MINGW64_VERSION_MAJOR < 3) -# error You need a newer version (>= 2.0) of mingw32/w32api -#endif - // When using the --std=c++0x option the compiler omits defining // the following required macros (at least with the GCC 4.6.2 version) // So we define them ourselves here. @@ -45,6 +34,17 @@ # define i386 1 #endif +#include "ace/config-g++-common.h" + +#include /**/ <_mingw.h> +#include /**/ <w32api.h> + +#define ACE_HAS_USER_MODE_MASKS + +#if (__MINGW32_MAJOR_VERSION < 2) && (__MINGW64_VERSION_MAJOR < 3) +# error You need a newer version (>= 2.0) of mingw32/w32api +#endif + // In strict ANSI mode (default when using --std=c++0x) the fileno() // macro is not defined so use the following work around. #if defined(__STRICT_ANSI__) |