summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/ace/ace_wchar.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index e6fab70de4f..9a6ab3ff4d5 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 28 13:03:13 2008 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ace/ace_wchar.h:
+ Removed obsolete workaround for Borland C++
+
Mon Jul 28 11:52:13 2008 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Registry.cpp:
diff --git a/ACE/ace/ace_wchar.h b/ACE/ace/ace_wchar.h
index 064be7deee9..a985f5cc28a 100644
--- a/ACE/ace/ace_wchar.h
+++ b/ACE/ace/ace_wchar.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+//* -*- C++ -*- */
//=============================================================================
/**
@@ -78,7 +78,7 @@
# include /**/ <cwctype>
# elif defined (ACE_HAS_WINCE)
# include /**/ <wtypes.h>
-# elif !defined (__BORLANDC__)
+# else
# include /**/ <wchar.h>
# endif /* ACE_HAS_STANDARD_CPP_LIBRARY */
#endif /* ACE_HAS_WCHAR */