diff options
| -rw-r--r-- | ACE/ChangeLog | 22 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_stdlib.cpp | 4 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_stdlib.h | 2 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_stdlib.inl | 2 | ||||
| -rw-r--r-- | ACE/ace/config-WinCE.h | 20 | ||||
| -rw-r--r-- | ACE/ace/config-win32-common.h | 2 |
6 files changed, 31 insertions, 21 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index de848593bc7..6d03590815c 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,8 +1,30 @@ +Mon Nov 10 15:28:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-WinCE.h: + Removed a lot of defines that are really not needed + + * ace/OS_NS_stdlib.{h,cpp,inl}: + Removed ACE_HAS_WINCE checks with realpath + + * ace/config-win32-common.h: + Latest wince versions do have missing defines + Mon Nov 10 14:28:00 UTC 2008 Simon Massey <sma at prismtech dot com> * tests/Process_Test.cpp: Another wchar issue. +Mon Nov 10 12:53:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-WinCE.h: + WinCE 5 and newer do have filelocks + + * ace/OS_NS_stdio.inl (flock_unlock): + Use UnlockFileEx because this is also available on WinCE + + * tests/Naming_Test.cpp: + Use ACE::get_temp_dir to get the real temp dir + Mon Nov 10 11:48:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Malloc_Test.cpp: diff --git a/ACE/ace/OS_NS_stdlib.cpp b/ACE/ace/OS_NS_stdlib.cpp index a9f2dfcc6b5..66ebde8c3d1 100644 --- a/ACE/ace/OS_NS_stdlib.cpp +++ b/ACE/ace/OS_NS_stdlib.cpp @@ -343,7 +343,7 @@ ACE_OS::realloc (void *ptr, size_t nbytes) return ACE_REALLOC_FUNC (ACE_MALLOC_T (ptr), nbytes); } -#if defined (ACE_LACKS_REALPATH) && !defined (ACE_HAS_WINCE) +#if defined (ACE_LACKS_REALPATH) char * ACE_OS::realpath (const char *file_name, char *resolved_name) @@ -514,7 +514,7 @@ ACE_OS::realpath (const char *file_name, return rpath; } -#endif /* ACE_LACKS_REALPATH && !ACE_HAS_WINCE */ +#endif /* ACE_LACKS_REALPATH */ #if defined (ACE_LACKS_STRTOL) long diff --git a/ACE/ace/OS_NS_stdlib.h b/ACE/ace/OS_NS_stdlib.h index 2dc5d16ec1e..0ff3fea27a2 100644 --- a/ACE/ace/OS_NS_stdlib.h +++ b/ACE/ace/OS_NS_stdlib.h @@ -217,7 +217,6 @@ namespace ACE_OS { extern ACE_Export void *realloc (void *, size_t); -#if !defined (ACE_HAS_WINCE) # if !defined (ACE_LACKS_REALPATH) ACE_NAMESPACE_INLINE_FUNCTION # else @@ -229,7 +228,6 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION wchar_t *realpath (const wchar_t *file_name, wchar_t *resolved_name); # endif /* ACE_HAS_WCHAR */ -#endif /* ACE_HAS_WINCE */ // exit_hook and set_exit_hook not in spec /// Function that is called by <ACE_OS::exit>, if non-null. diff --git a/ACE/ace/OS_NS_stdlib.inl b/ACE/ace/OS_NS_stdlib.inl index 29d8abdde46..94dfe2272b8 100644 --- a/ACE/ace/OS_NS_stdlib.inl +++ b/ACE/ace/OS_NS_stdlib.inl @@ -428,7 +428,6 @@ ACE_OS::rand_r (ACE_RANDR_TYPE& seed) #endif /* !ACE_WIN32 */ -#if !defined (ACE_HAS_WINCE) # if !defined (ACE_LACKS_REALPATH) ACE_INLINE char * ACE_OS::realpath (const char *file_name, @@ -440,7 +439,6 @@ ACE_OS::realpath (const char *file_name, return ::realpath (file_name, resolved_name); # endif /* ! ACE_WIN32 */ } -# endif /* !ACE_LACKS_REALPATH */ # if defined (ACE_HAS_WCHAR) ACE_INLINE wchar_t * diff --git a/ACE/ace/config-WinCE.h b/ACE/ace/config-WinCE.h index f8416fe1580..e4140135599 100644 --- a/ACE/ace/config-WinCE.h +++ b/ACE/ace/config-WinCE.h @@ -98,7 +98,9 @@ # define ACE_USES_WCHAR #endif /* ACE_USES_WCHAR */ +#if (_WIN32_WCE < 0x600) #define ACE_USES_WINCE_SEMA_SIMULATION +#endif #define ACE_HAS_NONSTATIC_OBJECT_MANAGER 1 @@ -187,9 +189,6 @@ // Need to find out what it is. (Used in MapViewOfFile ().) #define FILE_MAP_COPY 0 - -#define ACE_LACKS_STRCASECMP // WinCE doesn't support _stricmp -#define ACE_LACKS_GETSERVBYNAME #define ACE_LACKS_ACCESS #define ACE_LACKS__WACCESS #define ACE_HAS_ACCESS_EMULATION @@ -198,25 +197,16 @@ #endif #define ACE_LACKS_EXEC #define ACE_LACKS_MKTEMP -#define ACE_LACKS_STRRCHR -#define ACE_LACKS_BSEARCH -#define ACE_LACKS_SOCKET_BUFSIZ #define ACE_LACKS_ISATTY #define ACE_LACKS_STRERROR #define ACE_LACKS_SYSTEM -#define ACE_LACKS_SIGACTION #define ACE_LACKS_PIPE -//#define ACE_LACKS_CUSERID #define ACE_LACKS_CHDIR #define ACE_LACKS_ENV -#define ACE_LACKS_HOSTNAME #define ACE_LACKS_REALPATH -#define ACE_LACKS_READLINK #define ACE_LACKS_SWAB #define ACE_LACKS_TEMPNAM -#define ACE_LACKS_GETPROTOBYNUMBER -#define ACE_LACKS_GETPROTOBYNAME #if defined (_WIN32_WCE_EMULATION) // @@ For some reason, qsort isn't defined correctly (_stdcall vs _cdecl) @@ -237,6 +227,10 @@ typedef long off_t; #define ACE_HAS_STRDUP_EMULATION +#if !defined (MAXSYMLINKS) +#define MAXSYMLINKS 0 +#endif + // WinCE can't do fixed addresses for memory-mapped files. #if defined (ACE_DEFAULT_BASE_ADDR) # undef ACE_DEFAULT_BASE_ADDR @@ -252,8 +246,6 @@ typedef long off_t; #define ACE_DEFAULT_FILE_PERMS (FILE_SHARE_READ | FILE_SHARE_WRITE) #endif -// This is still true up thru VC8... -#define ACE_LACKS_ERRNO_H #define ACE_LACKS_SIGNAL_H #define ACE_LACKS_SYS_STAT_H diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h index 2aff243ebc3..87752d19929 100644 --- a/ACE/ace/config-win32-common.h +++ b/ACE/ace/config-win32-common.h @@ -449,7 +449,7 @@ # include /**/ <winsock2.h> // WinCE 4 doesn't define the Exxx values without the WSA prefix, so do that // here. This is all lifted from the #if 0'd out part of winsock2.h. -# if defined (UNDER_CE) +# if defined (UNDER_CE) && (UNDER_CE < 500) # define EWOULDBLOCK WSAEWOULDBLOCK # define EINPROGRESS WSAEINPROGRESS # define EALREADY WSAEALREADY |