added or protected #define of __ACE_INLINE__, and removed #define of ACE_HAS_INLINED_OSCALLS, because it's no longer needed

18 files changed, 69 insertions, 38 deletions

diff --git a/ace/config-linux-lxpthreads.h b/ace/config-linux-lxpthreads.h
index a3dc970ef65..e873e1a284b 100644
--- a/ace/config-linux-lxpthreads.h
+++ b/ace/config-linux-lxpthreads.h
@@ -28,6 +28,10 @@
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H
 
+#if ! defined (__ACE_INLINE__)
+#define __ACE_INLINE__
+#endif /* ! __ACE_INLINE__ */
+
 #define ACE_HAS_PENTIUM
 #define ACE_HAS_LONGLONG
 
diff --git a/ace/config-linux-pthread.h b/ace/config-linux-pthread.h
index 206008b2b7b..d42e1969554 100644
--- a/ace/config-linux-pthread.h
+++ b/ace/config-linux-pthread.h
@@ -7,6 +7,10 @@
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H
 
+#if ! defined (__ACE_INLINE__)
+#define __ACE_INLINE__
+#endif /* ! __ACE_INLINE__ */
+
 #define ACE_HAS_PENTIUM
 #define ACE_HAS_LONGLONG
 
diff --git a/ace/config-linux.h b/ace/config-linux.h
index 183dbc69fb5..958acef947f 100644
--- a/ace/config-linux.h
+++ b/ace/config-linux.h
@@ -7,6 +7,10 @@
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H
 
+#if ! defined (__ACE_INLINE__)
+#define __ACE_INLINE__
+#endif /* ! __ACE_INLINE__ */
+
 // Do we really need this #define here?
 #define LINUX 1.2.10
 
diff --git a/ace/config-m88k.h b/ace/config-m88k.h
index d5b2ac928dc..f9cb4c09f15 100644
--- a/ace/config-m88k.h
+++ b/ace/config-m88k.h
@@ -7,6 +7,10 @@
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H
 
+#if ! defined (__ACE_INLINE__)
+#define __ACE_INLINE__
+#endif /* ! __ACE_INLINE__ */
+
 #if !defined (m88k)
 #define m88k
 #endif
diff --git a/ace/config-osf1-4.0-g++.h b/ace/config-osf1-4.0-g++.h
index 55244809670..4981d0d1bcc 100644
--- a/ace/config-osf1-4.0-g++.h
+++ b/ace/config-osf1-4.0-g++.h
@@ -9,11 +9,9 @@
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H
 
+#if ! defined (__ACE_INLINE__)
 #define __ACE_INLINE__
-
-#if defined (__ACE_INLINE__)
-#define ACE_HAS_INLINED_OSCALLS
-#endif /* __ACE_INLINE__ */
+#endif /* ! __ACE_INLINE__ */
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/ace/config-osf1-4.0.h b/ace/config-osf1-4.0.h
index 34fa7bac26b..f675b78f160 100644
--- a/ace/config-osf1-4.0.h
+++ b/ace/config-osf1-4.0.h
@@ -10,6 +10,10 @@
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H
 
+#if ! defined (__ACE_INLINE__)
+#define __ACE_INLINE__
+#endif /* ! __ACE_INLINE__ */
+
 // DJT removed this due to some minor issues related to the
 // definitions of timestruc_t and tid_t in procfs.h not sure what
 // functionality is lost?  Platform supports <sys/procfs.h>
diff --git a/ace/config-sco-4.2-nothread.h b/ace/config-sco-4.2-nothread.h
index 7b06f57db8e..f7f42c4b050 100644
--- a/ace/config-sco-4.2-nothread.h
+++ b/ace/config-sco-4.2-nothread.h
@@ -7,6 +7,10 @@
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H
 
+#if ! defined (__ACE_INLINE__)
+#define __ACE_INLINE__
+#endif /* ! __ACE_INLINE__ */
+
 // Compiling for SCO.
 #if !defined (SCO)
 #define SCO
diff --git a/ace/config-sunos4-g++.h b/ace/config-sunos4-g++.h
index 0e825963bd5..c771e885d40 100644
--- a/ace/config-sunos4-g++.h
+++ b/ace/config-sunos4-g++.h
@@ -6,6 +6,10 @@
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H
 
+#if ! defined (__ACE_INLINE__)
+#define __ACE_INLINE__
+#endif /* ! __ACE_INLINE__ */
+
 #define ACE_NEEDS_SYSTIME_H
 
 // Must specialize templates due to G++'s lame parameterized type
diff --git a/ace/config-sunos5.4-g++.h b/ace/config-sunos5.4-g++.h
index edce9b257cd..7cdebe6df6f 100644
--- a/ace/config-sunos5.4-g++.h
+++ b/ace/config-sunos5.4-g++.h
@@ -7,13 +7,11 @@
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H
 
-#define ACE_HAS_UNICODE
-
+#if ! defined (__ACE_INLINE__)
 #define __ACE_INLINE__
+#endif /* ! __ACE_INLINE__ */
 
-#if defined (__ACE_INLINE__)
-#define ACE_HAS_INLINED_OSCALLS
-#endif /* __ACE_INLINE__ */
+#define ACE_HAS_UNICODE
 
 #define ACE_HAS_TERM_IOCTLS
 
diff --git a/ace/config-sunos5.4-sunc++-4.x-orbix.h b/ace/config-sunos5.4-sunc++-4.x-orbix.h
index 8885f710d9f..2e301f0e3ba 100644
--- a/ace/config-sunos5.4-sunc++-4.x-orbix.h
+++ b/ace/config-sunos5.4-sunc++-4.x-orbix.h
@@ -8,6 +8,10 @@
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H
 
+#if ! defined (__ACE_INLINE__)
+#define __ACE_INLINE__
+#endif /* ! __ACE_INLINE__ */
+
 #define ACE_HAS_UNICODE
 
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
diff --git a/ace/config-sunos5.4-sunc++-4.x.h b/ace/config-sunos5.4-sunc++-4.x.h
index 2020f1984d8..8d35cce6830 100644
--- a/ace/config-sunos5.4-sunc++-4.x.h
+++ b/ace/config-sunos5.4-sunc++-4.x.h
@@ -7,6 +7,10 @@
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H
 
+#if ! defined (__ACE_INLINE__)
+#define __ACE_INLINE__
+#endif /* ! __ACE_INLINE__ */
+
 #define ACE_HAS_UNICODE
 
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
diff --git a/ace/config-sunos5.5-g++.h b/ace/config-sunos5.5-g++.h
index e2965c8ef48..3933cb507b4 100644
--- a/ace/config-sunos5.5-g++.h
+++ b/ace/config-sunos5.5-g++.h
@@ -7,6 +7,10 @@
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H
 
+#if ! defined (__ACE_INLINE__)
+#define __ACE_INLINE__
+#endif /* ! __ACE_INLINE__ */
+
 // ACE_HAS_EXCEPTIONS requires -fhandle-exceptions, but that gives
 // g++ 2.7.2 fits:  it spits out all kinds of warnings that it doesn't
 // without that option (and that are just wrong), and runs out of
@@ -16,12 +20,6 @@
 
 #define ACE_HAS_UNICODE
 
-#define __ACE_INLINE__
-
-#if defined (__ACE_INLINE__)
-#define ACE_HAS_INLINED_OSCALLS
-#endif /* __ACE_INLINE__ */
-
 // G++ doesn't support template typedefs fully (yet).
 // #define ACE_HAS_TEMPLATE_TYPEDEFS
 
diff --git a/ace/config-sunos5.5-sunc++-4.1.h b/ace/config-sunos5.5-sunc++-4.1.h
index 8a0ab62e940..8ef0c2525a5 100644
--- a/ace/config-sunos5.5-sunc++-4.1.h
+++ b/ace/config-sunos5.5-sunc++-4.1.h
@@ -11,6 +11,10 @@
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H
 
+#if ! defined (__ACE_INLINE__)
+#define __ACE_INLINE__
+#endif /* ! __ACE_INLINE__ */
+
 // ACE_HAS_EXCEPTIONS requires -noex, but that causes problems with
 // Sun C++ 4.1 on multiprocessor UltraSparcs:  threaded executables
 // core dump when threads exit.  This problem does not seem to appear
@@ -21,10 +25,6 @@
 
 #define ACE_HAS_UNICODE
 
-#if defined (__ACE_INLINE__)
-#define ACE_HAS_INLINED_OSCALLS
-#endif /* __ACE_INLINE__ */
-
 // Note that SunC++ 4.1 fixes template bugs that prevented earlier
 // versions from supporting template typedefs correctly.
 // #define ACE_HAS_TEMPLATE_TYPEDEFS
diff --git a/ace/config-sunos5.5-sunc++-4.x-orbix.h b/ace/config-sunos5.5-sunc++-4.x-orbix.h
index 7979bb8c88a..4ad5980ed76 100644
--- a/ace/config-sunos5.5-sunc++-4.x-orbix.h
+++ b/ace/config-sunos5.5-sunc++-4.x-orbix.h
@@ -9,6 +9,10 @@
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H
 
+#if ! defined (__ACE_INLINE__)
+#define __ACE_INLINE__
+#endif /* ! __ACE_INLINE__ */
+
 // until we can trust exception handling with Sun C++, it's not enabled . . .
 // #define ACE_HAS_EXCEPTIONS
 
diff --git a/ace/config-sunos5.5-sunc++-4.x.h b/ace/config-sunos5.5-sunc++-4.x.h
index ba7d2e0798d..d096fa20d7d 100644
--- a/ace/config-sunos5.5-sunc++-4.x.h
+++ b/ace/config-sunos5.5-sunc++-4.x.h
@@ -7,6 +7,10 @@
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H
 
+#if ! defined (__ACE_INLINE__)
+#define __ACE_INLINE__
+#endif /* ! __ACE_INLINE__ */
+
 // until we can trust exception handling with Sun C++, it's not enabled . . .
 // #define ACE_HAS_EXCEPTIONS
 
diff --git a/ace/config-unixware-2.01-g++.h b/ace/config-unixware-2.01-g++.h
index 66ff69664ca..2a65ad56589 100644
--- a/ace/config-unixware-2.01-g++.h
+++ b/ace/config-unixware-2.01-g++.h
@@ -8,18 +8,15 @@
 
 // See README for what the ACE_HAS... and ACE_LACKS... macros mean
 
+#if ! defined (__ACE_INLINE__)
+#define __ACE_INLINE__
+#endif /* ! __ACE_INLINE__ */
+
 #define ACE_LACKS_STRCASECMP
 #define ACE_HAS_SIZET_SOCKET_LEN
 #define ACE_HAS_AUTOMATIC_INIT_FINI
 #define ACE_HAS_CPLUSPLUS_HEADERS
 #define ACE_HAS_GNU_CSTRING_H
-
-#define __ACE_INLINE__
-
-#if defined (__ACE_INLINE__)
-#define ACE_HAS_INLINED_OSCALLS
-#endif /* __ACE_INLINE__ */
-
 #define ACE_HAS_MSG
 #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
 // Not yet sure about threads
diff --git a/ace/config-vxworks-ghs-1.8.h b/ace/config-vxworks-ghs-1.8.h
index bfec0d48c64..f0c357306fe 100644
--- a/ace/config-vxworks-ghs-1.8.h
+++ b/ace/config-vxworks-ghs-1.8.h
@@ -7,6 +7,10 @@
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H
 
+#if ! defined (__ACE_INLINE__)
+#define __ACE_INLINE__
+#endif /* ! __ACE_INLINE__ */
+
 #define ACE_LACKS_STRCASECMP
 #define ACE_LACKS_COND_T
 #define ACE_LACKS_RWLOCK_T
@@ -16,13 +20,6 @@
 #define ACE_HAS_CLOCK_GETTIME
 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
 #define ACE_HAS_CPLUSPLUS_HEADERS
-
-#define __ACE_INLINE__
-
-#if defined (__ACE_INLINE__)
-#define ACE_HAS_INLINED_OSCALLS
-#endif /* __ACE_INLINE__ */
-
 #define ACE_HAS_MSG
 #define ACE_HAS_MT_SAFE_SOCKETS
 #define ACE_HAS_POSIX_NONBLOCK
diff --git a/ace/config-vxworks5.2-g++.h b/ace/config-vxworks5.2-g++.h
index f31b6b9ba20..9fab6c5f906 100644
--- a/ace/config-vxworks5.2-g++.h
+++ b/ace/config-vxworks5.2-g++.h
@@ -7,6 +7,10 @@
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H
 
+#if ! defined (__ACE_INLINE__)
+#define __ACE_INLINE__
+#endif /* ! __ACE_INLINE__ */
+
 #define ACE_LACKS_STRCASECMP
 #define ACE_LACKS_SYS_NERR
 #define ACE_LACKS_COND_T
@@ -18,11 +22,6 @@
 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
 #define ACE_HAS_CPLUSPLUS_HEADERS
 #define ACE_HAS_GNU_CSTRING_H
-
-#if defined (__ACE_INLINE__)
-#define ACE_HAS_INLINED_OSCALLS
-#endif /* __ACE_INLINE__ */
-
 #define ACE_HAS_MSG
 #define ACE_HAS_MT_SAFE_SOCKETS
 #define ACE_HAS_POSIX_NONBLOCK