Wed Oct 18 15:41:20 2000 Luther J Baker <luther@cs.wustl.edu>

5 files changed, 36 insertions, 18 deletions

diff --git a/PACE/ChangeLog b/PACE/ChangeLog
index 49ae2fffd9c..729b99c8526 100644
--- a/PACE/ChangeLog
+++ b/PACE/ChangeLog
@@ -1,3 +1,14 @@
+Wed Oct 18 15:41:20 2000  Luther J Baker  <luther@cs.wustl.edu>
+
+	* pace/win32/pthread.h:
+	* pace/win32/pthreadtypes.h:
+	* pace/semphore.h:
+	* pace/win32/semphore.h:	
+	* pace/win32/semphore.inl:
+
+	  Debugging ACE building with PACE over NT
+	  ACE_HAS_PACE.
+
 Tue Oct  3 15:37:35 2000  Joe Hoffert  <joeh@cs.wustl.edu>
 
         * pace/posix/stdio.inl:
diff --git a/PACE/pace/win32/pthread.inl b/PACE/pace/win32/pthread.inl
index 6d1bdf27b87..7a61a99d66f 100644
--- a/PACE/pace/win32/pthread.inl
+++ b/PACE/pace/win32/pthread.inl
@@ -367,9 +367,7 @@ PACE_INLINE
 int
 pace_pthread_equal (pace_pthread_t t1, pace_pthread_t t2)
 {
-  PACE_UNUSED_ARG (t1);
-  PACE_UNUSED_ARG (t2);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
+  return t1 == t2;
 }
 #endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
 
diff --git a/PACE/pace/win32/pthreadtypes.h b/PACE/pace/win32/pthreadtypes.h
index cb1309194a4..9d578a56801 100644
--- a/PACE/pace/win32/pthreadtypes.h
+++ b/PACE/pace/win32/pthreadtypes.h
@@ -45,11 +45,6 @@ extern "C" {
 
 #ifndef PACE_PTHREAD_COND_T
 #define PACE_PTHREAD_COND_T 1
-
-
-
-
-
   typedef struct pthread_cond_t
   {
 #if 0
@@ -63,10 +58,6 @@ extern "C" {
 
   } pace_pthread_cond_t;
 
-
-
-
-
 #endif /* PACE_PTHREAD_COND_T */
 
 #ifndef PACE_PTHREAD_CONDATTR_T
@@ -96,7 +87,13 @@ extern "C" {
 #endif
 
     /* Mutex kind: fast, recursive or errcheck */
-    int mutex_kind_;
+    int type_;
+
+    union
+    {
+       HANDLE proc_mutex_;
+       CRITICAL_SECTION thr_mutex_;
+    };
 
 #if 0
     /* Underlying fast lock */
diff --git a/PACE/pace/win32/semaphore.h b/PACE/pace/win32/semaphore.h
index c600bf7e068..d7e395f7fc6 100644
--- a/PACE/pace/win32/semaphore.h
+++ b/PACE/pace/win32/semaphore.h
@@ -24,9 +24,6 @@ extern "C" {
 
 #ifndef PACE_SEM_T
 #define PACE_SEM_T
-  /* Temporary fix until we emulate these funcs.
-     typedef mqd_t pace_mqd_t;
-   */
   typedef HANDLE pace_sem_t;
 #endif /* PACE_SEM_T */
 
@@ -43,6 +40,10 @@ extern "C" {
 #endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
 
 #if (PACE_HAS_POSIX_NONUOF_FUNCS)
+  pace_sem_t * sem_open (const char * name, int oflag, ...);
+#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
+
+#if (PACE_HAS_POSIX_NONUOF_FUNCS)
   int sem_post (pace_sem_t * sem);
 #endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
 
diff --git a/PACE/pace/win32/semaphore.inl b/PACE/pace/win32/semaphore.inl
index cdef7d7fe8a..796abccb479 100644
--- a/PACE/pace/win32/semaphore.inl
+++ b/PACE/pace/win32/semaphore.inl
@@ -48,8 +48,8 @@ pace_sem_getvalue (pace_sem_t * sem, int * sval)
 PACE_INLINE
 int
 pace_sem_init (pace_sem_t * sem,
-                             int pshared,
-                             unsigned int value)
+               int pshared,
+               unsigned int value)
 {
   return sem_init (sem, pshared, value);
 }
@@ -57,6 +57,17 @@ pace_sem_init (pace_sem_t * sem,
 
 #if (PACE_HAS_POSIX_NONUOF_FUNCS)
 PACE_INLINE
+pace_sem_t *
+pace_sem_open (const char * name, int oflag, ...)
+{
+  PACE_UNUSED_ARG (name);
+  PACE_UNUSED_ARG (oflag);
+  return (pace_sem_t)NULL;
+}
+#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
+
+#if (PACE_HAS_POSIX_NONUOF_FUNCS)
+PACE_INLINE
 int
 pace_sem_post (pace_sem_t * sem)
 {