From 7cb812e895bc37891d20c5d7f8e1103f66b973b9 Mon Sep 17 00:00:00 2001
From: sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>
Date: Mon, 10 Apr 2006 10:30:46 +0000
Subject: Mon Apr 10 10:27:03 UTC 2006  Don Sharp    
 <Donald.Sharp@prismtech.com>

---
 ChangeLog               | 25 +++++++++++++++----------
 tests/Unload_libACE.cpp | 12 ++++++++++++
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 522e8617955..f5b59739eb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Apr 10 10:27:03 UTC 2006  Don Sharp     <Donald.Sharp@prismtech.com>
+
+        * tests/Unload_libACE.cpp:
+          Set up a guard for WIN32 && ACE_USES_WCHAR.
+
 Mon Apr 10 09:36:00 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * bin/MakeProjectCreator/config/ciao_rtevent_dnc.mpb:
@@ -30,19 +35,19 @@ Mon Apr 10 06:23:00 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Sun Apr  9 12:00:00 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
 
-	* docs/ACE-bug-process.html: Updated this page to more accurately
-	  reflect how the DOC group handles enhancement requests.  Thanks
- 	  to David White <david dot white dot 7 at gmail dot com> for
- 	  motivating this.
+        * docs/ACE-bug-process.html: Updated this page to more accurately
+          reflect how the DOC group handles enhancement requests.  Thanks
+          to David White <david dot white dot 7 at gmail dot com> for
+          motivating this.
 
 Sat Apr  8 18:32:29 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
 
-	* ace/Shared_Memory_MM.h (ACE_Shared_Memory_MM):
-	* ace/Shared_Memory_SV.h (ACE_Shared_Memory_SV):
-	  Added comments that underscore that these classes should not be
- 	  used and instead ACE_Malloc or ACE_Mem_Map should be used.
-  	  Thanks to Qingbo Cai <qingbo dot cai at case dot edu> for motivating these
-	  comments.
+        * ace/Shared_Memory_MM.h (ACE_Shared_Memory_MM):
+        * ace/Shared_Memory_SV.h (ACE_Shared_Memory_SV):
+          Added comments that underscore that these classes should not be
+          used and instead ACE_Malloc or ACE_Mem_Map should be used.
+          Thanks to Qingbo Cai <qingbo dot cai at case dot edu> for motivating these
+          comments.
 
 Fri Apr  7 19:56:03 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
diff --git a/tests/Unload_libACE.cpp b/tests/Unload_libACE.cpp
index 07268f113e7..a9c52e30c4c 100644
--- a/tests/Unload_libACE.cpp
+++ b/tests/Unload_libACE.cpp
@@ -225,8 +225,20 @@ main ( int, char ** )
    return 0;
 }
 #else
+# if defined (WIN32) && defined (ACE_USES_WCHAR)
+// Borrow include list from ace_wchar.h
+# if defined (ACE_HAS_WINCE)
+#   include /**/ <wtypes.h>
+# elif !defined (__BORLANDC__)
+#   include /**/ <wchar.h>
+# endif /* ACE_HAS_WINCE || __BORLANDC__ */
+
+int
+wmain ( int, wchar_t ** )
+#else
 int
 main ( int, char ** )
+#endif /* (WIN32) && (ACE_USES_WCHAR) */
 {
    char const *const program = "UnloadLibACE";
 
-- 
cgit v1.2.1