summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2002-03-17 10:58:12 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2002-03-17 10:58:12 +0000
commitd25f31cc5748e0184a1e74841b7f3090c228e5df (patch)
treefad7018ffefe2e1bd9915d88897c408a8eeca349
parente421f9781048c4f84d5efe9c4424d119495e0869 (diff)
downloadATCD-d25f31cc5748e0184a1e74841b7f3090c228e5df.tar.gz
ChangeLogTag: Sun Mar 17 11:53:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLogs/ChangeLog-02a5
-rw-r--r--ChangeLogs/ChangeLog-03a5
-rw-r--r--include/makeinclude/compiler.bor2
4 files changed, 16 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 73c86781934..5c0210f171f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Mar 17 11:53:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * include/makeinclude/compiler.bor:
+ When doing a wchar build don't automatically define UNICODE and _UNICODE.
+
Fri Mar 15 18:08:28 2002 Steve Huston <shuston@riverace.com>
* ace/config-aix-4.x.h: Removed the optional setting of
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 73c86781934..5c0210f171f 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,8 @@
+Sun Mar 17 11:53:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * include/makeinclude/compiler.bor:
+ When doing a wchar build don't automatically define UNICODE and _UNICODE.
+
Fri Mar 15 18:08:28 2002 Steve Huston <shuston@riverace.com>
* ace/config-aix-4.x.h: Removed the optional setting of
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 73c86781934..5c0210f171f 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,8 @@
+Sun Mar 17 11:53:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * include/makeinclude/compiler.bor:
+ When doing a wchar build don't automatically define UNICODE and _UNICODE.
+
Fri Mar 15 18:08:28 2002 Steve Huston <shuston@riverace.com>
* ace/config-aix-4.x.h: Removed the optional setting of
diff --git a/include/makeinclude/compiler.bor b/include/makeinclude/compiler.bor
index 8b380503165..24d3f7a08cf 100644
--- a/include/makeinclude/compiler.bor
+++ b/include/makeinclude/compiler.bor
@@ -65,7 +65,7 @@ CODEGUARD_CFLAGS = -vG
!endif
!ifdef UNICODE
-UNICODE_CFLAGS = -DACE_USES_WCHAR -WU -DUNICODE -D_UNICODE
+UNICODE_CFLAGS = -DACE_USES_WCHAR -WU
!endif
THREAD_CFLAGS = -D_MT -tWM