summaryrefslogtreecommitdiff
path: root/ACE/tests/Service_Config_Test.cpp
diff options
context:
space:
mode:
authorolli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2011-03-15 21:26:56 +0000
committerolli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2011-03-15 21:26:56 +0000
commit2e12e3c9ea578720c282a724ae11280cffdb7977 (patch)
treee74ec2961361e6b08a3fc99cfd837f95c92f5d63 /ACE/tests/Service_Config_Test.cpp
parentc7b0ec93d4c473a16da75234678f676dc8f5d4bd (diff)
downloadATCD-2e12e3c9ea578720c282a724ae11280cffdb7977.tar.gz
ChangeLogTag: Tue Mar 15 21:24:11 UTC 2011 Olli Savia <ops@iki.fi>
Diffstat (limited to 'ACE/tests/Service_Config_Test.cpp')
-rw-r--r--ACE/tests/Service_Config_Test.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/ACE/tests/Service_Config_Test.cpp b/ACE/tests/Service_Config_Test.cpp
index 53473bf667b..95d7fba70fa 100644
--- a/ACE/tests/Service_Config_Test.cpp
+++ b/ACE/tests/Service_Config_Test.cpp
@@ -570,7 +570,7 @@ testOrderlyInstantiation (int , ACE_TCHAR *[])
// To do this, we need a native thread entry and, thus, it needs special care
// for each platform type. Feel free to add more platforms as needed here and
// in main() where the test is called.
-#if defined (ACE_HAS_WTHREADS) || defined (ACE_HAS_PTHREADS_STD)
+#if defined (ACE_HAS_WTHREADS) || defined (ACE_HAS_PTHREADS)
# if defined (ACE_HAS_WTHREADS)
extern "C" unsigned int __stdcall
# else
@@ -664,7 +664,7 @@ testNonACEThread ()
WaitForSingleObject (thr_h, INFINITE);
CloseHandle (thr_h);
}
-#elif defined (ACE_HAS_PTHREADS_STD)
+#elif defined (ACE_HAS_PTHREADS)
pthread_t thr_id;
int status = pthread_create (&thr_id, 0, nonacethreadentry, &log_msg_attrs);
if (status != 0)
@@ -699,7 +699,7 @@ testNonACEThread ()
}
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Non-ACE thread lookup test completed\n")));
}
-#endif /* ACE_HAS_WTHREADS || ACE_HAS_PTHREADS_STD */
+#endif /* ACE_HAS_WTHREADS || ACE_HAS_PTHREADS */
int
run_main (int argc, ACE_TCHAR *argv[])
@@ -713,7 +713,7 @@ run_main (int argc, ACE_TCHAR *argv[])
testUnloadingACELoggingStrategy (argc, argv);
testLimits (argc, argv);
testrepository (argc, argv);
-#if defined (ACE_HAS_WTHREADS) || defined (ACE_HAS_PTHREADS_STD)
+#if defined (ACE_HAS_WTHREADS) || defined (ACE_HAS_PTHREADS)
testNonACEThread();
#endif