ChangeLogTag:Tue Apr 25 08:57:59 2000 Darrell Brunsch <brunsch@uci.edu>

1 files changed, 13 insertions, 42 deletions

diff --git a/ASNMP/tests/test_config.h b/ASNMP/tests/test_config.h
index dc9155b8605..4f18d05d7cd 100644
--- a/ASNMP/tests/test_config.h
+++ b/ASNMP/tests/test_config.h
@@ -46,49 +46,20 @@ typedef size_t KEY;
 
 #if defined (ACE_WIN32)
 
-#define ACE_DEFAULT_TEST_FILE_A "C:\\temp\\ace_test_file"
-#define ACE_TEMP_FILE_NAME_A "C:\\temp\\ace_temp_file"
-#define ACE_LOG_DIRECTORY_A "C:\\temp\\log\\"
-#define MAKE_PIPE_NAME_A(X) "\\\\.\\pipe\\"#X
-
-#define ACE_DEFAULT_TEST_FILE_W L"C:\\temp\\ace_test_file"
-#define ACE_TEMP_FILE_NAME_W L"C:\\temp\\ace_temp_file"
-#define ACE_LOG_DIRECTORY_W L"C:\\temp\\log\\"
-#define MAKE_PIPE_NAME_W(X) L"\\\\.\\pipe\\"#X
+#define ACE_DEFAULT_TEST_FILE ACE_TEXT ("C:\\temp\\ace_test_file")
+#define ACE_TEMP_FILE_NAME ACE_TEXT ("C:\\temp\\ace_temp_file")
+#define ACE_LOG_DIRECTORY ACE_TEXT ("C:\\temp\\log\\")
+#define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\"#X)
 
 #else
 
-#define ACE_DEFAULT_TEST_FILE_A "/tmp/ace_test_file"
-#define ACE_TEMP_FILE_NAME_A "/tmp/ace_temp_file"
-#define ACE_LOG_DIRECTORY_A "log/"
-#define MAKE_PIPE_NAME_A(X) X
-
-#if defined (ACE_HAS_UNICODE)
-#define ACE_DEFAULT_TEST_FILE_W L"/tmp/ace_test_file"
-#define ACE_TEMP_FILE_NAME_W L"/tmp/ace_temp_file"
-#define ACE_LOG_DIRECTORY_W L"log/"
-#define MAKE_PIPE_NAME_W(X) L##X
-#else
-#define ACE_DEFAULT_TEST_FILE_W "/tmp/ace_test_file"
-#define ACE_TEMP_FILE_NAME_W "/tmp/ace_temp_file"
-#define ACE_LOG_DIRECTORY_W "log/"
-#define MAKE_PIPE_NAME_W(X) X
-#endif /* ACE_HAS_UNICODE */
+#define ACE_DEFAULT_TEST_FILE ACE_TEXT ("/tmp/ace_test_file")
+#define ACE_TEMP_FILE_NAME ACE_TEXT ("/tmp/ace_temp_file")
+#define ACE_LOG_DIRECTORY ACE_TEXT ("log/")
+#define MAKE_PIPE_NAME(X) ACE_TEXT (X)
 
 #endif /* ACE_WIN32 */
 
-#if defined (UNICODE)
-#define ACE_DEFAULT_TEST_FILE ACE_DEFAULT_TEST_FILE_W
-#define ACE_TEMP_FILE_NAME ACE_TEMP_FILE_NAME_W
-#define ACE_LOG_DIRECTORY ACE_LOG_DIRECTORY_W
-#define MAKE_PIPE_NAME MAKE_PIPE_NAME_W
-#else
-#define ACE_DEFAULT_TEST_FILE ACE_DEFAULT_TEST_FILE_A
-#define ACE_TEMP_FILE_NAME ACE_TEMP_FILE_NAME_A
-#define ACE_LOG_DIRECTORY ACE_LOG_DIRECTORY_A
-#define MAKE_PIPE_NAME MAKE_PIPE_NAME_A
-#endif /* UNICODE */
-
 #define ACE_START_TEST(NAME) \
   const char *program = NAME; \
   ACE_LOG_MSG->open (program, ACE_Log_Msg::OSTREAM); \
@@ -121,8 +92,8 @@ do {\
 #define ACE_INIT_LOG(NAME) \
   char temp[BUFSIZ]; \
   ACE_OS::sprintf (temp, "%s%s%s", \
-                   ACE_LOG_DIRECTORY_A, \
-                   ACE::basename (NAME, ACE_DIRECTORY_SEPARATOR_CHAR_A), \
+                   ACE_LOG_DIRECTORY, \
+                   ACE::basename (NAME, ACE_DIRECTORY_SEPARATOR_CHAR), \
                    ".log"); \
   ACE_DEBUG ((LM_DEBUG, "Deleting old log file %s (if any)\n\n", temp)); \
   ACE_OS::unlink (temp);
@@ -166,10 +137,10 @@ ACE_Test_Output::set_output (const char *filename, int append)
 {
   char temp[BUFSIZ];
   // Ignore the error value since the directory may already exist.
-  ACE_OS::mkdir (ACE_LOG_DIRECTORY_A);
+  ACE_OS::mkdir (ACE_LOG_DIRECTORY);
   ACE_OS::sprintf (temp, "%s%s%s",
-                   ACE_LOG_DIRECTORY_A,
-                   ACE::basename (filename, ACE_DIRECTORY_SEPARATOR_CHAR_A),
+                   ACE_LOG_DIRECTORY,
+                   ACE::basename (filename, ACE_DIRECTORY_SEPARATOR_CHAR),
                    ".log");
 
   int flags = ios::out;