summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--ChangeLogs/ChangeLog-02a12
-rw-r--r--ChangeLogs/ChangeLog-03a12
-rw-r--r--ace/OS_String.cpp2
-rw-r--r--ace/config-win32-borland.h1
-rw-r--r--ace/config-win32-msvc.h1
6 files changed, 39 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ef472f3a189..674854794db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Mon Nov 13 01:07:36 2000 Darrell Brunsch <brunsch@uci.edu>
+
+ * ace/OS_String.cpp:
+ * ace/config-win32-borland.h:
+ * ace/config-win32-msvc.h:
+
+ Christopher Kohlhoff <chris@kohlhoff.com> mentioned to me
+ that Borland did have a wcsdup, but it was named differently
+ than the _wcsdup in MSVC. I took his suggestion and added
+ a ACE_WCSDUP_EQUIVALENT for MSVC's version and enabled
+ wcsdup for Borland's config.
+
Mon Nov 13 00:36:29 2000 Darrell Brunsch <brunsch@uci.edu>
* ace/Obstack.cpp:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index ef472f3a189..674854794db 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,15 @@
+Mon Nov 13 01:07:36 2000 Darrell Brunsch <brunsch@uci.edu>
+
+ * ace/OS_String.cpp:
+ * ace/config-win32-borland.h:
+ * ace/config-win32-msvc.h:
+
+ Christopher Kohlhoff <chris@kohlhoff.com> mentioned to me
+ that Borland did have a wcsdup, but it was named differently
+ than the _wcsdup in MSVC. I took his suggestion and added
+ a ACE_WCSDUP_EQUIVALENT for MSVC's version and enabled
+ wcsdup for Borland's config.
+
Mon Nov 13 00:36:29 2000 Darrell Brunsch <brunsch@uci.edu>
* ace/Obstack.cpp:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index ef472f3a189..674854794db 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,15 @@
+Mon Nov 13 01:07:36 2000 Darrell Brunsch <brunsch@uci.edu>
+
+ * ace/OS_String.cpp:
+ * ace/config-win32-borland.h:
+ * ace/config-win32-msvc.h:
+
+ Christopher Kohlhoff <chris@kohlhoff.com> mentioned to me
+ that Borland did have a wcsdup, but it was named differently
+ than the _wcsdup in MSVC. I took his suggestion and added
+ a ACE_WCSDUP_EQUIVALENT for MSVC's version and enabled
+ wcsdup for Borland's config.
+
Mon Nov 13 00:36:29 2000 Darrell Brunsch <brunsch@uci.edu>
* ace/Obstack.cpp:
diff --git a/ace/OS_String.cpp b/ace/OS_String.cpp
index 0e70a4201c4..c37ce1285bc 100644
--- a/ace/OS_String.cpp
+++ b/ace/OS_String.cpp
@@ -96,6 +96,8 @@ ACE_OS_String::strdup (const wchar_t *s)
return 0;
return ACE_OS_String::strcpy (buffer, s);
+# elif defined (ACE_WCSDUP_EQUIVALENT)
+ return ACE_WCSDUP_EQUIVALENT (s);
# else /* ACE_LACKS_WCSDUP */
return ::wcsdup (s);
# endif /* ACE_LACKS_WCSDUP */
diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h
index 3f22191dad3..e9b00a4377f 100644
--- a/ace/config-win32-borland.h
+++ b/ace/config-win32-borland.h
@@ -65,7 +65,6 @@
# define ACE_LACKS_PLACEMENT_OPERATOR_DELETE 1
# define ACE_LACKS_PRAGMA_ONCE 1
# define ACE_LACKS_STRRECVFD 1
-# define ACE_LACKS_WCSDUP 1
# define ACE_NEW_THROWS_EXCEPTIONS 1
# define ACE_SIZEOF_LONG_DOUBLE 10
# define ACE_TEMPLATES_REQUIRE_SOURCE 1
diff --git a/ace/config-win32-msvc.h b/ace/config-win32-msvc.h
index 7c3e248d545..58fb04fb903 100644
--- a/ace/config-win32-msvc.h
+++ b/ace/config-win32-msvc.h
@@ -69,6 +69,7 @@
#define ACE_ITOA_EQUIVALENT ::_itoa
#define ACE_STRCASECMP_EQUIVALENT ::_stricmp
#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp
+#define ACE_WCSDUP_EQUIVALENT ::_wcsdup
// VC5 doesn't support operator placement delete
# if defined (_MSC_VER) && (_MSC_VER < 1200)