ChangeLogTag: Mon Jan 31 08:18:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

9 files changed, 15 insertions, 3 deletions

diff --git a/ASNMP/examples/get/get.mpc b/ASNMP/examples/get/get.mpc
index 63e09955d42..ffa5a2a5f53 100644
--- a/ASNMP/examples/get/get.mpc
+++ b/ASNMP/examples/get/get.mpc
@@ -4,6 +4,7 @@ project (asnmp_example_get) : aceexe {
   exename = get
   after += asnmp_lib
   libs  += asnmp
+  avoids += uses_wchar
   includes += $(ACE_ROOT)/ASNMP
   source_files {
     get.cpp
@@ -14,6 +15,7 @@ project (asnmp_example_get_async) : aceexe {
   exename = get_async
   after += asnmp_lib
   libs  += asnmp
+  avoids += uses_wchar
   includes += $(ACE_ROOT)/ASNMP
   source_files {
     get_async.cpp
diff --git a/ASNMP/examples/next/next.mpc b/ASNMP/examples/next/next.mpc
index 6fe405a1e51..f0022cb46a2 100644
--- a/ASNMP/examples/next/next.mpc
+++ b/ASNMP/examples/next/next.mpc
@@ -4,6 +4,7 @@ project (asnmp_example_next) : aceexe {
   exename = next
   after += asnmp_lib
   libs  += asnmp
+  avoids += uses_wchar
   includes += $(ACE_ROOT)/ASNMP
   source_files {
     next.cpp
diff --git a/ASNMP/examples/set/set.mpc b/ASNMP/examples/set/set.mpc
index 46c8f7f87d1..bb40f93e6df 100644
--- a/ASNMP/examples/set/set.mpc
+++ b/ASNMP/examples/set/set.mpc
@@ -4,6 +4,7 @@ project (asnmp_example_set) : aceexe {
   exename = set
   after += asnmp_lib
   libs  += asnmp
+  avoids += uses_wchar
   includes += $(ACE_ROOT)/ASNMP
   source_files {
     set.cpp
diff --git a/ASNMP/examples/trap/trap.mpc b/ASNMP/examples/trap/trap.mpc
index 9330364a84d..d0d6dc8e897 100644
--- a/ASNMP/examples/trap/trap.mpc
+++ b/ASNMP/examples/trap/trap.mpc
@@ -4,6 +4,7 @@ project (asnmp_example_trap) : aceexe {
   exename = trap
   after += asnmp_lib
   libs  += asnmp
+  avoids += uses_wchar
   includes += $(ACE_ROOT)/ASNMP
   source_files {
     trap.cpp
diff --git a/ASNMP/examples/walk/walk.mpc b/ASNMP/examples/walk/walk.mpc
index 478405a786a..aff0fb98d35 100644
--- a/ASNMP/examples/walk/walk.mpc
+++ b/ASNMP/examples/walk/walk.mpc
@@ -4,6 +4,7 @@ project (asnmp_example_walk) : aceexe {
   exename = walk
   after += asnmp_lib
   libs  += asnmp
+  avoids += uses_wchar
   includes += $(ACE_ROOT)/ASNMP
   source_files {
     walk.cpp
diff --git a/ChangeLog b/ChangeLog
index 07ee2b39cc5..8c7248b2409 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 31 08:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/APG/Reactor/Timers.cpp:
+          Fixed unicode link errors
+
 Mon Jan 31 07:16:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/ace_wchar.h:
diff --git a/apps/JAWS/clients/Caching/http_client.cpp b/apps/JAWS/clients/Caching/http_client.cpp
index 66fb2e09887..f0bb20b6d56 100644
--- a/apps/JAWS/clients/Caching/http_client.cpp
+++ b/apps/JAWS/clients/Caching/http_client.cpp
@@ -25,7 +25,7 @@
 ACE_RCSID(Caching, http_client, "$Id$")
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   // Present a command line.
   // * Accept a URL.
diff --git a/apps/mkcsregdb/mkcsregdb.mpc b/apps/mkcsregdb/mkcsregdb.mpc
index 529916cb54c..3dea8f982e5 100644
--- a/apps/mkcsregdb/mkcsregdb.mpc
+++ b/apps/mkcsregdb/mkcsregdb.mpc
@@ -2,4 +2,5 @@
 // $Id$
 
 project: aceexe {
+  avoids += uses_wchar
 }
diff --git a/examples/APG/Logging/Trace_Return.cpp b/examples/APG/Logging/Trace_Return.cpp
index 4a7fd135169..1bb32a03456 100644
--- a/examples/APG/Logging/Trace_Return.cpp
+++ b/examples/APG/Logging/Trace_Return.cpp
@@ -13,7 +13,7 @@ void foo (void);
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   TRACE ("main");
-    
+
   MY_DEBUG (ACE_TEXT ("Hi Mom\n"));
   foo ();
   MY_DEBUG (ACE_TEXT ("Goodnight\n"));
@@ -32,7 +32,7 @@ void foo (void)
 #else
 #include <stdio.h>
 
-int main (int, char *[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   puts ("This example only works on g++ 2.96 and later.\n");
   return 0;