summaryrefslogtreecommitdiff
path: root/ace/ACE.cpp
diff options
context:
space:
mode:
authorgonzo <gonzo@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-06-10 07:33:55 +0000
committergonzo <gonzo@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-06-10 07:33:55 +0000
commite48607d3e409cba2447fe8dc24ffb98810f96579 (patch)
treecbd17a5dffadf187dae53b850675c7f0567768a6 /ace/ACE.cpp
parent176b60d72029863ce45ff0998de5078bf5b3c72a (diff)
downloadATCD-e48607d3e409cba2447fe8dc24ffb98810f96579.tar.gz
Tests now run OK (most of them) with BCB3
Diffstat (limited to 'ace/ACE.cpp')
-rw-r--r--ace/ACE.cpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index 35fbe41d76c..86d83d15f7a 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -565,10 +565,11 @@ ACE::ldfind (const ASYS_TCHAR filename[],
// Insert canonical directory separators.
ASYS_TCHAR *separator_ptr;
- if (ACE_DIRECTORY_SEPARATOR_CHAR != '/')
- // Make all the directory separators ``canonical'' to simplify
- // subsequent code.
- ACE::strrepl (tempcopy, ACE_DIRECTORY_SEPARATOR_CHAR, '/');
+#if (ACE_DIRECTORY_SEPARATOR_CHAR != '/')
+ // Make all the directory separators ``canonical'' to simplify
+ // subsequent code.
+ ACE::strrepl (tempcopy, ACE_DIRECTORY_SEPARATOR_CHAR, '/');
+#endif
// Separate filename from pathname.
separator_ptr = ACE_OS::strrchr (tempcopy, '/');
@@ -635,9 +636,10 @@ ACE::ldfind (const ASYS_TCHAR filename[],
}
else
{
- if (ACE_DIRECTORY_SEPARATOR_CHAR != '/')
- // Revert to native path name separators
- ACE::strrepl (searchpathname, '/', ACE_DIRECTORY_SEPARATOR_CHAR);
+#if (ACE_DIRECTORY_SEPARATOR_CHAR != '/')
+ // Revert to native path name separators
+ ACE::strrepl (searchpathname, '/', ACE_DIRECTORY_SEPARATOR_CHAR);
+#endif
// First, try matching the filename *without* adding a
// prefix.
@@ -1623,8 +1625,7 @@ ACE::handle_timed_accept (ACE_HANDLE listener,
/* NOTREACHED */
}
}
- /* NOTREACHED */
- return 0;
+ ACE_NOTREACHED(return 0);
}
// Bind socket to an unused port.