summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-02-22 16:54:28 +0000
committerbrunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-02-22 16:54:28 +0000
commit8c9becd1546b40026d71281e1fd5fbb2524cd634 (patch)
tree922b8a7df00a1a792ccd72ea5089d0c80e0b2c3c
parent92b140b97ddf4298531e0ba7a0ad8403a8b045fd (diff)
downloadATCD-8c9becd1546b40026d71281e1fd5fbb2524cd634.tar.gz
ChangeLogTag:Thu Feb 22 08:51:42 2001 Darrell Brunsch <brunsch@uci.edu>
-rw-r--r--ChangeLog10
-rw-r--r--ChangeLogs/ChangeLog-02a10
-rw-r--r--ChangeLogs/ChangeLog-03a10
-rw-r--r--ace/OS.i2
4 files changed, 31 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f9a63484ce..4083582f4a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Thu Feb 22 08:51:42 2001 Darrell Brunsch <brunsch@uci.edu>
+
+ * ace/OS.i:
+
+ Bleh. Changed an && to || to make sure we get a symbolname
+ variable for non-Unicode Win32.
+
+ "He who lives without committing any folly is not so
+ wise as he thinks" - La Rochefoucauld
+
Thu Feb 22 08:43:30 2001 Carlos O'Ryan <coryan@uci.edu>
* include/makeinclude/rules.local.GNU:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 5f9a63484ce..4083582f4a3 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,13 @@
+Thu Feb 22 08:51:42 2001 Darrell Brunsch <brunsch@uci.edu>
+
+ * ace/OS.i:
+
+ Bleh. Changed an && to || to make sure we get a symbolname
+ variable for non-Unicode Win32.
+
+ "He who lives without committing any folly is not so
+ wise as he thinks" - La Rochefoucauld
+
Thu Feb 22 08:43:30 2001 Carlos O'Ryan <coryan@uci.edu>
* include/makeinclude/rules.local.GNU:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 5f9a63484ce..4083582f4a3 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,13 @@
+Thu Feb 22 08:51:42 2001 Darrell Brunsch <brunsch@uci.edu>
+
+ * ace/OS.i:
+
+ Bleh. Changed an && to || to make sure we get a symbolname
+ variable for non-Unicode Win32.
+
+ "He who lives without committing any folly is not so
+ wise as he thinks" - La Rochefoucauld
+
Thu Feb 22 08:43:30 2001 Carlos O'Ryan <coryan@uci.edu>
* include/makeinclude/rules.local.GNU:
diff --git a/ace/OS.i b/ace/OS.i
index 94a58058694..4587f19f034 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 */