summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-09-02 21:33:26 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-09-02 21:33:26 +0000
commitb53d3866d925b7b1fce7cf310a945b0b29b7e847 (patch)
tree52a98415538cbf060faeb712e066c8be37b90b92
parentf12d26bc10ebe7cf6eff88492db8675759b117e3 (diff)
downloadATCD-b53d3866d925b7b1fce7cf310a945b0b29b7e847.tar.gz
Guard against double definition of ACE_NO_INLINE.
-rw-r--r--ace/OS.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ace/OS.h b/ace/OS.h
index f48f2de6690..4f75ec80b1b 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -31,7 +31,7 @@ typedef long id_t;
# error UNICODE must be defined when using ACE_HAS_MOSTLY_UNICODE_APIS, check your compiler document on how to enable UNICODE.
# endif /* ACE_HAS_MOSTLY_UNICODE_APIS && !UNICODE */
-# if defined (ACE_LACKS_INLINE_FUNCTIONS)
+# if defined (ACE_LACKS_INLINE_FUNCTIONS) && !define (ACE_NO_INLINE)
# define ACE_NO_INLINE
# endif