From 540d8094061d8f86930d64413afc250a3d25c299 Mon Sep 17 00:00:00 2001 From: brunsch Date: Thu, 11 May 2000 22:23:31 +0000 Subject: ChangeLogTag:Thu May 11 15:21:34 2000 Darrell Brunsch --- ChangeLog | 8 ++++++++ ChangeLogs/ChangeLog-02a | 8 ++++++++ ChangeLogs/ChangeLog-03a | 8 ++++++++ ace/OS.i | 2 +- 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e02d34a6454..782f4dbd89f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu May 11 15:21:34 2000 Darrell Brunsch + + * ace/OS.i (dlsym): + + I was checking for ACE_HAS_WIN32 instead of ACE_WIN32, + so this wasn't doing what it was supposed to with + ACE_USES_WCHAR turned on. + Thu May 11 02:04:58 2000 Irfan Pyarali * ace/OS.h diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index e02d34a6454..782f4dbd89f 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Thu May 11 15:21:34 2000 Darrell Brunsch + + * ace/OS.i (dlsym): + + I was checking for ACE_HAS_WIN32 instead of ACE_WIN32, + so this wasn't doing what it was supposed to with + ACE_USES_WCHAR turned on. + Thu May 11 02:04:58 2000 Irfan Pyarali * ace/OS.h diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index e02d34a6454..782f4dbd89f 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,11 @@ +Thu May 11 15:21:34 2000 Darrell Brunsch + + * ace/OS.i (dlsym): + + I was checking for ACE_HAS_WIN32 instead of ACE_WIN32, + so this wasn't doing what it was supposed to with + ACE_USES_WCHAR turned on. + Thu May 11 02:04:58 2000 Irfan Pyarali * ace/OS.h diff --git a/ace/OS.i b/ace/OS.i index 3743cb52dfb..96845cc2de6 100644 --- a/ace/OS.i +++ b/ace/OS.i @@ -9320,7 +9320,7 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle, // Get the correct OS type. #if defined (ACE_HAS_WINCE) const wchar_t *symbolname = sname; -#elif defined (ACE_HAS_WIN32) && defined (ACE_USES_WCHAR) +#elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR) char *symbolname = ACE_TEXT_ALWAYS_CHAR (sname); #elif defined (ACE_HAS_CHARPTR_DL) char *symbolname = ACE_const_cast (char *, sname); -- cgit v1.2.1