diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-24 22:27:32 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-24 22:27:32 +0000 |
| commit | 7d8fe4b07f79d38efde2e46bdeb53aeb5ffe89cc (patch) | |
| tree | fcb8eca85ef93cb26038e5a03a7cb5c5253de5c9 | |
| parent | 062e1b5a099e006476d8f66229f2938676f1d8cb (diff) | |
| download | ATCD-7d8fe4b07f79d38efde2e46bdeb53aeb5ffe89cc.tar.gz | |
Defined ACE_HAS_TEXT_MACRO_CONFLICT, seeing that MSVC already defines
__TEXT.
| -rw-r--r-- | ace/config-win32.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ace/config-win32.h b/ace/config-win32.h index 3307cf1bf5b..4dcef73a715 100644 --- a/ace/config-win32.h +++ b/ace/config-win32.h @@ -3,7 +3,7 @@ // The following configuration file is designed to work for Windows 95, // Windows NT 3.51 and Windows NT 4.0 platforms using the Microsoft Visual C++ -// compilers 2.0, 4.0, 4.1, 4.2 and 5.0 +// compilers 2.0, 4.0, 4.1, 4.2, 5.0 and 6.0 #ifndef ACE_CONFIG_H #define ACE_CONFIG_H @@ -167,6 +167,9 @@ # undef ACE_HAS_NONSTATIC_OBJECT_MANAGER #endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER */ +// MSVC already defined __TEXT +#define ACE_HAS_TEXT_MACRO_CONFLICT + #define ACE_HAS_GPERF // ----------------------- platform specific defines -------------------- |