Mon Aug 28 17:43:00 2000 Luther J Baker <luther@cs.wustl.edu>

5 files changed, 68 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 26a53fe4942..77b75f7c4ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Mon Aug 28 17:43:00 2000  Luther J Baker  <luther@cs.wustl.edu>
+
+	* ace/config-win32.h:
+
+	  Added support for PACE and win32.
+
+	* ace/OS.h::2283
+
+	  Altered code to support
+	  #define ACE_HAS_PACE && #define WTHREADS.
+
 Mon Aug 28 15:05:27 2000  Michael Kircher  <Michael.Kircher@mchp.siemens.de>
 
 	* ace/OS_Dirent.cpp: Changed a condition in readdir_emulation ()
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 26a53fe4942..77b75f7c4ef 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,14 @@
+Mon Aug 28 17:43:00 2000  Luther J Baker  <luther@cs.wustl.edu>
+
+	* ace/config-win32.h:
+
+	  Added support for PACE and win32.
+
+	* ace/OS.h::2283
+
+	  Altered code to support
+	  #define ACE_HAS_PACE && #define WTHREADS.
+
 Mon Aug 28 15:05:27 2000  Michael Kircher  <Michael.Kircher@mchp.siemens.de>
 
 	* ace/OS_Dirent.cpp: Changed a condition in readdir_emulation ()
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 26a53fe4942..77b75f7c4ef 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,14 @@
+Mon Aug 28 17:43:00 2000  Luther J Baker  <luther@cs.wustl.edu>
+
+	* ace/config-win32.h:
+
+	  Added support for PACE and win32.
+
+	* ace/OS.h::2283
+
+	  Altered code to support
+	  #define ACE_HAS_PACE && #define WTHREADS.
+
 Mon Aug 28 15:05:27 2000  Michael Kircher  <Michael.Kircher@mchp.siemens.de>
 
 	* ace/OS_Dirent.cpp: Changed a condition in readdir_emulation ()
diff --git a/ace/OS.h b/ace/OS.h
index 39948a5aa39..0284058e8d9 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -522,23 +522,23 @@ typedef int key_t;
 ///////////////////////////////////////////
 
 #if defined (ACE_HAS_PACE)
-#include "pace/dirent.h"
-#include "pace/fcntl.h"
-#include "pace/sys/mman.h"
-#include "pace/pthread.h"
-#include "pace/pwd.h"
-#include "pace/stdio.h"
-#include "pace/stdlib.h"
-#include "pace/sched.h"
-#include "pace/semaphore.h"
-#include "pace/signal.h"
-#include "pace/sys/stat.h"
-#include "pace/stdio.h"
-#include "pace/time.h"
-#include "pace/unistd.h"
-#include "pace/sys/utsname.h"
-#include "pace/sys/wait.h"
-#define ACE_HAS_POSIX_SEM
+# include "pace/dirent.h"
+# include "pace/fcntl.h"
+# include "pace/sys/mman.h"
+# include "pace/pthread.h"
+# include "pace/pwd.h"
+# include "pace/stdio.h"
+# include "pace/stdlib.h"
+# include "pace/sched.h"
+# include "pace/semaphore.h"
+# include "pace/signal.h"
+# include "pace/sys/stat.h"
+# include "pace/stdio.h"
+# include "pace/time.h"
+# include "pace/unistd.h"
+# include "pace/sys/utsname.h"
+# include "pace/sys/wait.h"
+# define ACE_HAS_POSIX_SEM
 #endif /* ACE_HAS_PACE */
 
 # if defined (ACE_PSOS)
@@ -2272,13 +2272,16 @@ typedef struct
 // Wrapper for NT Events.
 typedef HANDLE ACE_event_t;
 
+#   if !defined (ACE_HAS_PACE)
+// This can probably get _wider_ as more types are defined in PACE.
+// ie: see above ACE_mutex_t
+
 //@@ ACE_USES_WINCE_SEMA_SIMULATION is used to debug
 //   semaphore simulation on WinNT.  It should be
 //   changed to ACE_USES_HAS_WINCE at some later point.
 #     if !defined (ACE_USES_WINCE_SEMA_SIMULATION)
 typedef HANDLE ACE_sema_t;
 #     else
-
 class ACE_Export ACE_sema_t
 {
   // = TITLE
@@ -2295,6 +2298,7 @@ public:
 };
 
 #     endif /* ACE_USES_WINCE_SEMA_SIMULATION */
+#   endif /* !ACE_HAS_PACE */
 
 // These need to be different values, neither of which can be 0...
 #     define USYNC_THREAD 1
diff --git a/ace/config-win32.h b/ace/config-win32.h
index ae61127505d..014b5fc33bc 100644
--- a/ace/config-win32.h
+++ b/ace/config-win32.h
@@ -9,6 +9,19 @@
 #define ACE_CONFIG_H
 #include "ace/pre.h"
 
+// If you wish to build ACE using PACE, you must uncomment
+// the following lines or include the following syntax in your
+// config file #included before this one!
+//# if !defined (ACE_HAS_PACE)
+//#  define ACE_HAS_PACE
+//# endif // ACE_HAS_PACE
+
+# if defined (ACE_HAS_PACE)
+#  ifndef PACE_HAS_ALL_POSIX_FUNCS
+#   define PACE_HAS_ALL_POSIX_FUNCS 1
+#  endif /* PACE_HAS_ALL_POSIX_FUNCS */
+# endif /* ACE_HAS_PACE */
+
 #if defined (ACE_HAS_WINCE) || defined (UNDER_CE)
 # include "ace/config-WinCE.h"
 #endif /* ACE_HAS_WINCE */