summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-23 17:16:14 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-23 17:16:14 +0000
commit6b4aadf41b2823b8c423346659358c735a3e11f8 (patch)
tree9b96939494fd6bd933bf7423370791dac3996fcd
parent68930e4239fbce56e7ab14aa56670e5cd31acb4c (diff)
downloadATCD-6b4aadf41b2823b8c423346659358c735a3e11f8.tar.gz
ChangeLogTag:Fri Jul 23 12:09:18 1999 Nanbor Wang <nanbor@cs.wustl.edu>
-rw-r--r--ace/ACE.cpp8
-rw-r--r--ace/OS.i4
2 files changed, 6 insertions, 6 deletions
diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index 6a71340f649..727cf444e9a 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -252,7 +252,7 @@ ACE::strsplit_r (char *str,
const char *
ACE::execname (const char *old_name)
{
-#if defined (ACE_HAS_WIN32)
+#if defined (ACE_WIN32)
if (ACE_OS::strstr (old_name, ".exe") == 0)
{
char *new_name;
@@ -274,7 +274,7 @@ ACE::execname (const char *old_name)
return new_name;
}
-#endif /* ACE_HAS_WIN32 */
+#endif /* ACE_WIN32 */
return old_name;
}
@@ -332,7 +332,7 @@ ACE::strsplit_r (wchar_t *str,
const wchar_t *
ACE::execname (const wchar_t *old_name)
{
-#if defined (ACE_HAS_WIN32)
+#if defined (ACE_WIN32)
if (ACE_OS::strstr (old_name, L".exe") == 0)
{
wchar_t *new_name;
@@ -354,7 +354,7 @@ ACE::execname (const wchar_t *old_name)
return new_name;
}
-#endif /* ACE_HAS_WIN32 */
+#endif /* ACE_WIN32 */
return old_name;
}
#endif /* ACE_HAS_UNICODE */
diff --git a/ace/OS.i b/ace/OS.i
index 50f547b0011..e44d5ae56ec 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -6113,7 +6113,7 @@ ACE_OS::last_error (void)
return lerrno == 0 ? lerror : lerrno;
#else
return errno;
-#endif /* ACE_HAS_WIN32 */
+#endif /* ACE_WIN32 */
}
ACE_INLINE void
@@ -6124,7 +6124,7 @@ ACE_OS::last_error (int error)
::SetLastError (error);
#else
errno = error;
-#endif /* ACE_HAS_WIN32 */
+#endif /* ACE_WIN32 */
}
#if !defined (ACE_HAS_WINCE)