diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1996-12-08 23:54:00 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1996-12-08 23:54:00 +0000 |
| commit | ca3d786a8a358cc57f504868dfc5b43e4911db98 (patch) | |
| tree | af4bd397c8ef8836e99bcc4ea3699878f7a2ff04 /ace | |
| parent | 096fd42841208fee8eb91ab895b4c232c3b0e3c3 (diff) | |
| download | ATCD-ca3d786a8a358cc57f504868dfc5b43e4911db98.tar.gz | |
*** empty log message ***
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/OS.h | 19 | ||||
| -rw-r--r-- | ace/config-win32-msvc4.0.h | 1 |
2 files changed, 14 insertions, 6 deletions
@@ -506,6 +506,7 @@ struct cancel_state }; #if defined (ACE_HAS_THREADS) + #if defined (ACE_HAS_STHREADS) #include /**/ <synch.h> #include /**/ <thread.h> @@ -526,7 +527,7 @@ struct cancel_state #define PTHREAD_EXPLICIT_SCHED 0 #define PTHREAD_MIN_PRIORITY 0 #define PTHREAD_MAX_PRIORITY 126 -#endif // ACE_HAS_FSU_PTHREADS +#endif /* ACE_HAS_FSU_PTHREADS */ #if defined (ACE_HAS_SETKIND_NP) #define PRIORITY_MAX PTHREAD_MAX_PRIORITY @@ -642,8 +643,13 @@ typedef pthread_mutex_t ACE_thread_mutex_t; struct ACE_sema_t { ACE_mutex_t lock_; + // Serialize access to internal state. + ACE_cond_t count_nonzero_; + // Block until there are no waiters. + u_long count_; + // Number of waiters. }; #endif /* !ACE_HAS_POSIX_SEM */ @@ -694,9 +700,10 @@ typedef ACE_mutex_t ACE_thread_mutex_t; #define THR_CANCEL_ENABLE 0 #define THR_CANCEL_DEFERRED 0 #define THR_CANCEL_ASYNCHRONOUS 0 -#elif defined(VXWORKS) -#include /**/ <semLib.h> // for mutex implementation using mutual-exclusion - // semaphores (which can be taken recursively) +#elif defined (VXWORKS) +// For mutex implementation using mutual-exclusion semaphores (which +// can be taken recursively). +#include /**/ <semLib.h> #include /**/ <taskLib.h> // task options: the other options are either obsolete, internal, or for @@ -776,8 +783,6 @@ struct ACE_rwlock_t // Value is -1 if writer has the lock, else this keeps track of the // number of readers holding the lock. }; - -#endif /* ACE_HAS_DCETHREADS || ACE_HAS_PTHREADS */ #elif defined (ACE_HAS_WTHREADS) typedef CRITICAL_SECTION ACE_thread_mutex_t; typedef struct @@ -869,7 +874,9 @@ typedef int ACE_rwlock_t; typedef int ACE_thread_t; typedef int ACE_hthread_t; typedef int ACE_thread_key_t; +#endif /* ACE_HAS_DCETHREADS || ACE_HAS_PTHREADS */ #endif /* ACE_HAS_THREADS */ + #include /**/ <sys/types.h> #include /**/ <assert.h> #include /**/ <sys/stat.h> diff --git a/ace/config-win32-msvc4.0.h b/ace/config-win32-msvc4.0.h index cd76b85a3d2..5f6c27ad6cb 100644 --- a/ace/config-win32-msvc4.0.h +++ b/ace/config-win32-msvc4.0.h @@ -89,6 +89,7 @@ #else #if !defined (_WINSOCKAPI_) #include /**/ <winsock.h> // will also include windows.h, if not present + #if defined (_MSC_VER) #pragma comment(lib, "wsock32.lib") #endif /* _MSC_VER */ |