diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-05-05 13:11:39 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-05-05 13:11:39 +0000 |
commit | b4a59ff5af21365da5c56e0f5ba9d1bf4cf5fa6e (patch) | |
tree | 2f8d399d178f928902b2bd9570687549428a358f | |
parent | f8219d34d49542f4fdea4425ba7ab9a924af9323 (diff) | |
download | ATCD-b4a59ff5af21365da5c56e0f5ba9d1bf4cf5fa6e.tar.gz |
ChangeLogTag: Fri May 5 12:00:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>Fri May 5 13:08:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ace/FIFO.cpp | 6 | ||||
-rw-r--r-- | ace/config-WinCE.h | 2 | ||||
-rw-r--r-- | ace/os_include/os_stddef.h | 14 |
4 files changed, 7 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog index fd8578a1555..0eee6cee433 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri May 5 13:08:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_openvms.GNU: + Changed the way templates are handled + Fri May 5 11:42:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Reactor_Token_T.h: diff --git a/ace/FIFO.cpp b/ace/FIFO.cpp index 3f2a4c5115b..cff340b6d57 100644 --- a/ace/FIFO.cpp +++ b/ace/FIFO.cpp @@ -37,16 +37,10 @@ ACE_FIFO::open (const ACE_TCHAR *r, int flags, mode_t perms, ACE_TRACE ("ACE_FIFO::open"); ACE_OS::strsncpy (this->rendezvous_, r, MAXPATHLEN); -#if defined (ACE_PSOS_DIAB_MIPS) - if ( ACE_OS::mkfifo (this->rendezvous_, perms) == -1 - && !(errno == EEXIST)) - return -1; -#else if ((flags & O_CREAT) != 0 && ACE_OS::mkfifo (this->rendezvous_, perms) == -1 && !(errno == EEXIST)) return -1; -#endif this->set_handle (ACE_OS::open (this->rendezvous_, flags, 0, sa)); return this->get_handle () == ACE_INVALID_HANDLE ? -1 : 0; diff --git a/ace/config-WinCE.h b/ace/config-WinCE.h index b59c655a064..556d09fc711 100644 --- a/ace/config-WinCE.h +++ b/ace/config-WinCE.h @@ -32,6 +32,8 @@ # define ACE_LACKS_SEARCH_H # define ACE_LACKS_WCHAR_H # define ACE_LACKS_WCTYPE_H +# define ACE_LACKS_STDDEF_H +# define ACE_LACKS_PTRDIFF_T #endif /* UNDER_CE < 400 */ #if !defined (ACE_HAS_WINCE) diff --git a/ace/os_include/os_stddef.h b/ace/os_include/os_stddef.h index 008a3f7ba1e..87bcbdd2e36 100644 --- a/ace/os_include/os_stddef.h +++ b/ace/os_include/os_stddef.h @@ -26,15 +26,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -// @todo move this to a windows config file -// Add new macro ACE_LACKS_STDDEF_H -#if defined (ACE_HAS_WINCE) && _WIN32_WCE < 400 -# if !defined (ACE_LACKS_STDDEF_H) -# define ACE_LACKS_STDDEF_H -# define ACE_LACKS_PTRDIFF_T -# endif /* !ACE_LACKS_STDDEF_H */ -#endif /* ACE_HAS_WINCE && _WIN32_WCE < 400 */ - #if !defined (ACE_LACKS_STDDEF_H) # include /**/ <stddef.h> #endif /* !ACE_LACKS_STDDEF_H */ @@ -96,11 +87,6 @@ extern "C" typedef ACE_SIZE_T_TYPE size_t; #endif /* ACE_LACKS_SIZE_T */ -#if defined (ACE_PSOS_DIAB_MIPS) -# undef size_t - typedef unsigned int size_t; -#endif - #ifdef __cplusplus } #endif /* __cplusplus */ |