summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2001-02-22 13:53:43 +0000
committerbala <balanatarajan@users.noreply.github.com>2001-02-22 13:53:43 +0000
commit0f930a947a49f3c9cc8a4263e4a811f6b69f06af (patch)
tree1bdf892e9958e2f3e280b87537f60c90a7ed0f0d
parent9694a5ed0ff86079c6dc1c3e6204d83f926a258d (diff)
downloadATCD-0f930a947a49f3c9cc8a4263e4a811f6b69f06af.tar.gz
ChangeLogTag: Thu Feb 22 07:51:36 2001 Balachandran Natarajan <bala@cs.wustl.edu>
-rw-r--r--ChangeLog9
-rw-r--r--ChangeLogs/ChangeLog-02a9
-rw-r--r--ChangeLogs/ChangeLog-03a9
-rw-r--r--ace/OS.i2
4 files changed, 25 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e60ab2dcaec..97cb8fc9b89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Feb 22 07:51:36 2001 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * ace/OS.i: Reverted the change "Thu Feb 22 03:31:06 2001
+ Krishnakumar B <kitty@ace.cs.wustl.edu> ". The beta 5.1.13 is
+ going to be zapped.
+
Thu Feb 22 03:52:25 2001 Krishnakumar B <kitty@cs.wustl.edu>
* ACE version 5.1.13 released.
@@ -5,7 +11,8 @@ Thu Feb 22 03:52:25 2001 Krishnakumar B <kitty@cs.wustl.edu>
Thu Feb 22 03:31:06 2001 Krishnakumar B <kitty@ace.cs.wustl.edu>
* ace/OS.i (dlsym):
- Hopefully fixed the Win32 builds. Removed a extra ! in the #ifdef.
+ Hopefully fixed the Win32 builds. Removed a extra ! in the
+ #ifdef.
Thu Feb 22 02:58:36 2001 Krishnakumar B <kitty@ace.cs.wustl.edu>
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index e60ab2dcaec..97cb8fc9b89 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Thu Feb 22 07:51:36 2001 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * ace/OS.i: Reverted the change "Thu Feb 22 03:31:06 2001
+ Krishnakumar B <kitty@ace.cs.wustl.edu> ". The beta 5.1.13 is
+ going to be zapped.
+
Thu Feb 22 03:52:25 2001 Krishnakumar B <kitty@cs.wustl.edu>
* ACE version 5.1.13 released.
@@ -5,7 +11,8 @@ Thu Feb 22 03:52:25 2001 Krishnakumar B <kitty@cs.wustl.edu>
Thu Feb 22 03:31:06 2001 Krishnakumar B <kitty@ace.cs.wustl.edu>
* ace/OS.i (dlsym):
- Hopefully fixed the Win32 builds. Removed a extra ! in the #ifdef.
+ Hopefully fixed the Win32 builds. Removed a extra ! in the
+ #ifdef.
Thu Feb 22 02:58:36 2001 Krishnakumar B <kitty@ace.cs.wustl.edu>
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index e60ab2dcaec..97cb8fc9b89 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,9 @@
+Thu Feb 22 07:51:36 2001 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * ace/OS.i: Reverted the change "Thu Feb 22 03:31:06 2001
+ Krishnakumar B <kitty@ace.cs.wustl.edu> ". The beta 5.1.13 is
+ going to be zapped.
+
Thu Feb 22 03:52:25 2001 Krishnakumar B <kitty@cs.wustl.edu>
* ACE version 5.1.13 released.
@@ -5,7 +11,8 @@ Thu Feb 22 03:52:25 2001 Krishnakumar B <kitty@cs.wustl.edu>
Thu Feb 22 03:31:06 2001 Krishnakumar B <kitty@ace.cs.wustl.edu>
* ace/OS.i (dlsym):
- Hopefully fixed the Win32 builds. Removed a extra ! in the #ifdef.
+ Hopefully fixed the Win32 builds. Removed a extra ! in the
+ #ifdef.
Thu Feb 22 02:58:36 2001 Krishnakumar B <kitty@ace.cs.wustl.edu>
diff --git a/ace/OS.i b/ace/OS.i
index 9a1d442e66e..94a58058694 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -9076,7 +9076,7 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle,
const wchar_t *symbolname = sname;
#elif defined (ACE_HAS_CHARPTR_DL)
char *symbolname = ACE_const_cast (char *, sname);
-#elif defined (ACE_WIN32) && !defined (ACE_USES_WCHAR)
+#elif !defined (ACE_WIN32) && !defined (ACE_USES_WCHAR)
const char *symbolname = sname;
#endif /* ACE_HAS_CHARPTR_DL */