diff options
| author | Steve Huston <shuston@riverace.com> | 1998-05-29 13:21:33 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 1998-05-29 13:21:33 +0000 |
| commit | 19604fcd3e56225e81c286ae09a06849623c4cf3 (patch) | |
| tree | 92fd336df9ebe222561975d5ef15f3680a4e468d /ace | |
| parent | b294a6dbd8af8512dd0e799113dff068f6984882 (diff) | |
| download | ATCD-19604fcd3e56225e81c286ae09a06849623c4cf3.tar.gz | |
Changed decision for order-of-include/inline from ACE_WIN32 to
ACE_HAS_ONE_DEFINITION_RULE.
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/Log_Msg.cpp | 2 | ||||
| -rw-r--r-- | ace/Trace.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp index 48e92c57d35..abe6617b526 100644 --- a/ace/Log_Msg.cpp +++ b/ace/Log_Msg.cpp @@ -13,7 +13,7 @@ // This must come first to avoid "order of include" problems... -#if !defined (ACE_HAS_INLINED_OSCALLS) && !defined (ACE_WIN32) +#if !defined (ACE_HAS_INLINED_OSCALLS) && !defined(ACE_HAS_ONE_DEFINITION_RULE) #define ACE_HAS_INLINED_OSCALLS #include "ace/ACE.h" #undef ACE_HAS_INLINED_OSCALLS diff --git a/ace/Trace.cpp b/ace/Trace.cpp index 3564e42e622..780d39d8c8d 100644 --- a/ace/Trace.cpp +++ b/ace/Trace.cpp @@ -14,7 +14,7 @@ // This must come first to avoid "order of include" problems... -#if !defined (ACE_HAS_INLINED_OSCALLS) && !defined (ACE_WIN32) +#if !defined (ACE_HAS_INLINED_OSCALLS) && !defined(ACE_HAS_ONE_DEFINITION_RULE) #define ACE_HAS_INLINED_OSCALLS #include "ace/ACE.h" #undef ACE_HAS_INLINED_OSCALLS |