summaryrefslogtreecommitdiff
path: root/ace/Service_Config.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ace/Service_Config.cpp')
-rw-r--r--ace/Service_Config.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index a40f54eb946..a8dc3c0da09 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -298,7 +298,7 @@ ACE_Service_Config::initialize (const ACE_Service_Type *sr,
}
}
-#if defined (ACE_HAS_LEGACY_SERVICE_CONFIG)
+#if defined (ACE_HAS_CLASSIC_SVC_CONF) && (ACE_HAS_CLASSIC_SVC_CONF == 1)
int
ACE_Service_Config::process_directives_i (ACE_Svc_Conf_Param *param)
{
@@ -323,7 +323,7 @@ ACE_Service_Config::process_directives_i (ACE_Svc_Conf_Param *param)
else
return 0;
}
-#endif /* ACE_HAS_LEGACY_SERVICE_CONFIG */
+#endif /* ACE_HAS_CLASSIC_SVC_CONF && ACE_HAS_CLASSIC_SVC_CONF == 1 */
int
ACE_Service_Config::process_file (const ACE_TCHAR file[])
@@ -332,7 +332,7 @@ ACE_Service_Config::process_file (const ACE_TCHAR file[])
int result = 0;
-#if defined (ACE_HAS_LEGACY_SERVICE_CONFIG)
+#if defined (ACE_HAS_CLASSIC_SVC_CONF) && (ACE_HAS_CLASSIC_SVC_CONF == 1)
FILE *fp = ACE_OS::fopen (file,
ACE_LIB_TEXT ("r"));
@@ -357,7 +357,7 @@ ACE_Service_Config::process_file (const ACE_TCHAR file[])
(void) ACE_OS::fclose (fp);
}
-#endif /* ACE_HAS_LEGACY_SERVICE_CONFIG */
+#endif /* ACE_HAS_CLASSIC_SVC_CONF && ACE_HAS_CLASSIC_SVC_CONF == 1 */
return result;
}
@@ -372,7 +372,7 @@ ACE_Service_Config::process_directive (const ACE_TCHAR directive[])
ACE_LIB_TEXT ("Service_Config::process_directive - %s\n"),
directive));
-#if defined (ACE_HAS_LEGACY_SERVICE_CONFIG)
+#if defined (ACE_HAS_CLASSIC_SVC_CONF) && (ACE_HAS_CLASSIC_SVC_CONF == 1)
ACE_UNUSED_ARG (directive);
ACE_Svc_Conf_Param d (directive);
@@ -382,7 +382,7 @@ ACE_Service_Config::process_directive (const ACE_TCHAR directive[])
return result;
#else
return -1;
-#endif /* ACE_HAS_LEGACY_SERVICE_CONFIG */
+#endif /* ACE_HAS_CLASSIC_SVC_CONF && ACE_HAS_CLASSIC_SVC_CONF == 1 */
}
// Process service configuration requests as indicated in the queue of