diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ace/config-vxworks5.x.h | 3 | ||||
| -rw-r--r-- | ace/os_include/sys/os_mman.h | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index ab19bd5763e..2cb1254bb53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Tue Jul 1 19:39:16 UTC 2003 Don Hinton <dhinton@dresystems.com> + + * ace/config-vxworks5.x.h: + Added ACE_LACKS_SYS_UN_H and ACE_LACKS_PTHREAD_H. + + * ace/os_include/sys/os_mman.h: + Added !defined (ACE_WIN32) to the intial #if for the PROT_* + define section so Windows can make it to the #ifelse section. + Sun Jun 29 01:31:52 UTC 2003 Don Hinton <dhinton@dresystems.com> * ace/UNIX_Addr.h: diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h index bfa28b80071..cd4a164a016 100644 --- a/ace/config-vxworks5.x.h +++ b/ace/config-vxworks5.x.h @@ -193,6 +193,9 @@ #define ACE_LACKS_STROPTS_H #define ACE_LACKS_SYS_MSG_H +// Not sure if these should always be defined. +#define ACE_LACKS_SYS_UN_H +#define ACE_LACKS_PTHREAD_H // Some string things #define ACE_LACKS_WCSCAT diff --git a/ace/os_include/sys/os_mman.h b/ace/os_include/sys/os_mman.h index c66c22f9bfb..80cf99a06b1 100644 --- a/ace/os_include/sys/os_mman.h +++ b/ace/os_include/sys/os_mman.h @@ -47,7 +47,7 @@ extern "C" { #endif /* __cplusplus */ -#if defined (ACE_LACKS_SYS_MMAN_H) +#if defined (ACE_LACKS_SYS_MMAN_H) && !defined (ACE_WIN32) # define PROT_READ 0 # define PROT_WRITE 0 # define PROT_EXEC 0 @@ -74,7 +74,7 @@ PAGE_EXECUTE_WRITECOPY PAGE_GUARD PAGE_NOACCESS PAGE_NOCACHE */ -#endif /* !ACE_LACKS_SYS_MMAN_H */ +#endif /* !ACE_LACKS_SYS_MMAN_H && !ACE_WIN32*/ #if !defined (PROT_RDWR) # define PROT_RDWR (PROT_READ|PROT_WRITE) |