summaryrefslogtreecommitdiff
path: root/ace/OS.h
diff options
context:
space:
mode:
Diffstat (limited to 'ace/OS.h')
-rw-r--r--ace/OS.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/ace/OS.h b/ace/OS.h
index 58e8432eae6..3446800d94c 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -389,11 +389,11 @@ typedef struct
// Used for dynamic linking.
# if !defined (ACE_DEFAULT_SVC_CONF)
-# if defined (ACE_USES_CLASSIC_SVC_CONF) && (ACE_USES_CLASSIC_SVC_CONF == 1)
+# if (ACE_USES_CLASSIC_SVC_CONF == 1)
# define ACE_DEFAULT_SVC_CONF "./svc.conf"
# else
# define ACE_DEFAULT_SVC_CONF "./svc.conf.xml"
-# endif /* ACE_USES_CLASSIC_SVC_CONF && ACE_USES_CLASSIC_SVC_CONF ==1 */
+# endif /* ACE_USES_CLASSIC_SVC_CONF ==1 */
# endif /* ACE_DEFAULT_SVC_CONF */
# if !defined (ACE_DEFAULT_SEM_KEY)
@@ -2949,11 +2949,11 @@ typedef void (*ACE_SignalHandlerV)(...);
// Used for dynamic linking
# if !defined (ACE_DEFAULT_SVC_CONF)
-# if defined (ACE_USES_CLASSIC_SVC_CONF) && (ACE_USES_CLASSIC_SVC_CONF == 1)
+# if (ACE_USES_CLASSIC_SVC_CONF == 1)
# define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT (".\\svc.conf")
# else
# define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT (".\\svc.conf.xml")
-# endif /* ACE_USES_CLASSIC_SVC_CONF && ACE_USES_CLASSIC_SVC_CONF ==1 */
+# endif /* ACE_USES_CLASSIC_SVC_CONF ==1 */
# endif /* ACE_DEFAULT_SVC_CONF */
// The following are #defines and #includes that are specific to
@@ -3288,11 +3288,11 @@ typedef ACE_UINT64 ACE_hrtime_t;
// Used for dynamic linking.
# if !defined (ACE_DEFAULT_SVC_CONF)
-# if defined (ACE_USES_CLASSIC_SVC_CONF) && (ACE_USES_CLASSIC_SVC_CONF == 1)
+# if (ACE_USES_CLASSIC_SVC_CONF == 1)
# define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT ("./svc.conf")
# else
# define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT ("./svc.conf.xml")
-# endif /* ACE_USES_CLASSIC_SVC_CONF && ACE_USES_CLASSIC_SVC_CONF ==1 */
+# endif /* ACE_USES_CLASSIC_SVC_CONF ==1 */
# endif /* ACE_DEFAULT_SVC_CONF */
// The following are #defines and #includes that are specific to UNIX.