diff options
| author | luther <luther@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-07 19:47:00 +0000 |
|---|---|---|
| committer | luther <luther@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-07 19:47:00 +0000 |
| commit | ed4dfb9a8136c2cf372cce1a24b55c0c73b89a4f (patch) | |
| tree | ff84c80c1f1b6974eb59b543749f2c204e4a8070 | |
| parent | 8ae995f27f05ca6d53b6ba8494f1290e786d68ff (diff) | |
| download | ATCD-ed4dfb9a8136c2cf372cce1a24b55c0c73b89a4f.tar.gz | |
Fri Jul 07 14:41:51 2000 Luther J Baker <luther@cs.wustl.edu>
| -rw-r--r-- | PACE/ChangeLog | 8 | ||||
| -rw-r--r-- | PACE/pace/win32/types.h | 14 |
2 files changed, 19 insertions, 3 deletions
diff --git a/PACE/ChangeLog b/PACE/ChangeLog index d020955f919..c36fc597342 100644 --- a/PACE/ChangeLog +++ b/PACE/ChangeLog @@ -1,3 +1,11 @@ +Fri Jul 07 14:41:51 2000 Luther J Baker <luther@cs.wustl.edu> + + * pace/win32/types.h: + + Fixed some non-native type problems. Also, made some temporary + types (pthread_*) until we actually get to win32/pthread.h at + which point, we will correctly define these. + Fri Jul 7 02:18:02 2000 John Heitmann <jwh1@cs.wustl.edu> * pace/posix/dirent.*: diff --git a/PACE/pace/win32/types.h b/PACE/pace/win32/types.h index 94bb6744319..b68cda4fa47 100644 --- a/PACE/pace/win32/types.h +++ b/PACE/pace/win32/types.h @@ -18,12 +18,12 @@ #ifndef PACE_SYS_TYPES_H #define PACE_SYS_TYPES_H +#include <wtypes.h> + #if defined (PACE_HAS_CPLUSPLUS) extern "C" { #endif /* PACE_HAS_CPLUSPLUS */ -typedef unsigned long DWORD; - /* Wrap a handle. */ # define PACE_HANDLE int # define PACE_INVALID_HANDLE -1 @@ -69,42 +69,50 @@ typedef unsigned long DWORD; #ifndef PACE_PTHREAD_ATTR_T #define PACE_PTHREAD_ATTR_T + typedef int pthread_attr_t; /* temporary */ typedef pthread_attr_t pace_pthread_attr_t; #endif /* PACE_PTHREAD_ATTR_T */ #ifndef PACE_PTHREAD_CONDATTR_T #define PACE_PTHREAD_CONDATTR_T + typedef int pthread_condattr_t; /* temporary */ typedef pthread_condattr_t pace_pthread_condattr_t; #endif /* PACE_PTHREAD_CONDATTR_T */ #ifndef PACE_PTHREAD_COND_T #define PACE_PTHREAD_COND_T + typedef int pthread_cond_t; /* temporary */ typedef pthread_cond_t pace_pthread_cond_t; #endif /* PACE_PTHREAD_COND_T */ #ifndef PACE_PTHREAD_KEY_T #define PACE_PTHREAD_KEY_T + typedef int pthread_key_t; /* temporary */ typedef pthread_key_t pace_pthread_key_t; #endif /* PACE_PTHREAD_KEY_T */ #ifndef PACE_PTHREAD_MUTEXATTR_T #define PACE_PTHREAD_MUTEXATTR_T + typedef int pthread_mutexattr_t; /* temporary */ typedef pthread_mutexattr_t pace_pthread_mutexattr_t; #endif /* PACE_PTHREAD_MUTEXATTR_T */ #ifndef PACE_PTHREAD_MUTEX_T #define PACE_PTHREAD_MUTEX_T + typedef int pthread_mutex_t; /* temporary */ typedef pthread_mutex_t pace_pthread_mutex_t; #endif /* PACE_PTHREAD_MUTEX_T */ #ifndef PACE_PTHREAD_ONCE_T #define PACE_PTHREAD_ONCE_T + typedef int pthread_once_t; /* temporary */ typedef pthread_once_t pace_pthread_once_t; #endif /* PACE_PTHREAD_ONCE_T */ #ifndef PACE_PTHREAD_T #define PACE_PTHREAD_T - typedef pthread_t pace_pthread_t; + typedef DWORD pace_pthread_t; + typedef HANDLE pace_hpthread_t; #endif /* PACE_PTHREAD_T */ #ifndef PACE_SIZE_T |