diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-05-10 01:01:51 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-05-10 01:01:51 +0000 |
| commit | c15b97952980be2877dca1a5ff8929f735dd6791 (patch) | |
| tree | de35bd83d59efc997e6758ea6bdbd8d4e9285d28 | |
| parent | e4473afc07811dca3de2452d8377e6b31f087bff (diff) | |
| download | ATCD-c15b97952980be2877dca1a5ff8929f735dd6791.tar.gz | |
ChangeLogTag:Sat May 10 19:19:09 UTC 2003 Don Hinton <dhinton@dresystems.com>
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | ace/OS.h | 20 | ||||
| -rw-r--r-- | ace/config-win32-msvc.h | 1 | ||||
| -rw-r--r-- | ace/os_include/sys/types.h | 12 |
4 files changed, 35 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index dc45e12fa88..7e3a9f44b10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Sat May 10 19:19:09 UTC 2003 Don Hinton <dhinton@dresystems.com> + + * ace/OS.h: + Commented and moved more code, as listed below. + + * ace/os_include/sys/types.h: + Added ACE_LACKS_SYS_MMAN_H define. + + * ace/os_include/sys/types.h: + Moved nlink_t, uid_t, gid_t, and caddr_t typedefs for + ACE_WIN32 here. + Fri May 9 22:45:24 UTC 2003 Don Hinton <dhinton@dresystems.com> * ace/OS.h: @@ -2773,7 +2773,7 @@ typedef void (*ACE_SignalHandlerV)(...); // FILETIME ru_stime; //}; -//// MMAP flags +#include "ace/os_include/sys/mman.h" //// MMAP flags //# define PROT_READ PAGE_READONLY //# define PROT_WRITE PAGE_READWRITE //# define PROT_RDWR PAGE_READWRITE @@ -2918,15 +2918,15 @@ typedef ACE_UINT64 ACE_hrtime_t; # endif # endif /* ACE_HAS_WINCE */ -# if !defined (__BORLANDC__) -typedef DWORD nlink_t; -# if !defined(__MINGW32__) -typedef u_short mode_t; -# endif /* !__MINGW32__ */ -typedef long uid_t; -typedef long gid_t; -# endif /* __BORLANDC__ */ -typedef char *caddr_t; +//# if !defined (__BORLANDC__) +//typedef DWORD nlink_t; +//# if !defined(__MINGW32__) +//typedef u_short mode_t; +//# endif /* !__MINGW32__ */ +//typedef long uid_t; +//typedef long gid_t; +//# endif /* __BORLANDC__ */ +//typedef char *caddr_t; typedef DWORD ACE_exitcode; # define ACE_SYSCALL_FAILED 0xFFFFFFFF diff --git a/ace/config-win32-msvc.h b/ace/config-win32-msvc.h index eb5402a4a14..b9295786117 100644 --- a/ace/config-win32-msvc.h +++ b/ace/config-win32-msvc.h @@ -65,6 +65,7 @@ #define ACE_LACKS_STROPTS_H #define ACE_LACKS_SYS_IOCTL_H #define ACE_LACKS_SYS_IPC_H +#define ACE_LACKS_SYS_MMAN_H #define ACE_LACKS_SYS_RESOURCE_H #define ACE_LACKS_SYS_SELECT_H #define ACE_LACKS_SYS_SEM_H diff --git a/ace/os_include/sys/types.h b/ace/os_include/sys/types.h index 80d25ecf99a..84a78a5b8aa 100644 --- a/ace/os_include/sys/types.h +++ b/ace/os_include/sys/types.h @@ -74,5 +74,17 @@ typedef unsigned int dev_t; # endif # endif /* ACE_HAS_LLSEEK || ACE_HAS_LSEEK64 */ +#if defined (ACE_WIN32) +# if !defined (__BORLANDC__) + typedef DWORD nlink_t; +# if !defined(__MINGW32__) + typedef u_short mode_t; +# endif /* !__MINGW32__ */ + typedef long uid_t; + typedef long gid_t; +# endif /* __BORLANDC__ */ + typedef char *caddr_t; +#endif /* ACE_WIN32 */ + #include "ace/post.h" #endif /* ACE_OS_INCLUDE_SYS_TYPES_H */ |