diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-09-30 08:38:57 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-09-30 08:38:57 +0000 |
| commit | d1763829ab925046a2dc75ebfa34baeceac9e892 (patch) | |
| tree | 5061c55665f93f07fba74284a533ad1b363ff06b | |
| parent | 69f440dc12e314a7d3f8146898c2f515032faea3 (diff) | |
| download | ATCD-d1763829ab925046a2dc75ebfa34baeceac9e892.tar.gz | |
ChangeLogTag: Fri Sep 30 08:38:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ace/OS_NS_stdio.cpp | 4 | ||||
| -rw-r--r-- | ace/OS_NS_stdio.inl | 2 | ||||
| -rw-r--r-- | ace/OS_NS_unistd.inl | 2 | ||||
| -rw-r--r-- | ace/README | 2 | ||||
| -rw-r--r-- | ace/config-win32-borland.h | 4 | ||||
| -rw-r--r-- | ace/config-win32-msvc-6.h | 1 |
6 files changed, 11 insertions, 4 deletions
diff --git a/ace/OS_NS_stdio.cpp b/ace/OS_NS_stdio.cpp index 0b5d1713740..d3d0cd4c751 100644 --- a/ace/OS_NS_stdio.cpp +++ b/ace/OS_NS_stdio.cpp @@ -131,7 +131,7 @@ ACE_OS::fopen (const char *filename, # else hmode &= _O_TEXT | _O_RDONLY | _O_APPEND; -# if (defined(__BORLANDC__) && __BORLANDC__ < 0x0570) +# if defined (ACE_LACKS_INTPTR_T) int fd = ::_open_osfhandle (long (handle), 0); # else int fd = ::_open_osfhandle (intptr_t (handle), 0); @@ -188,7 +188,7 @@ ACE_OS::fopen (const wchar_t *filename, # else hmode &= _O_TEXT | _O_RDONLY | _O_APPEND; -# if (defined(__BORLANDC__) && __BORLANDC__ < 0x0570) +# if defined (ACE_LACKS_INTPTR_T) int fd = ::_open_osfhandle (long (handle), hmode); # else int fd = ::_open_osfhandle (intptr_t (handle), hmode); diff --git a/ace/OS_NS_stdio.inl b/ace/OS_NS_stdio.inl index ada51707bea..ab505cf2164 100644 --- a/ace/OS_NS_stdio.inl +++ b/ace/OS_NS_stdio.inl @@ -635,7 +635,7 @@ ACE_OS::fdopen (ACE_HANDLE handle, const ACE_TCHAR *mode) FILE *file = 0; -#if (defined(__BORLANDC__) && __BORLANDC__ < 0x0570) +#if defined (ACE_LACKS_INTPTR_T) int crt_handle = ::_open_osfhandle (long (handle), 0); #else int crt_handle = ::_open_osfhandle (intptr_t (handle), 0); diff --git a/ace/OS_NS_unistd.inl b/ace/OS_NS_unistd.inl index ecfbacda0fd..f4a0d644ce2 100644 --- a/ace/OS_NS_unistd.inl +++ b/ace/OS_NS_unistd.inl @@ -736,7 +736,7 @@ ACE_OS::isatty (ACE_HANDLE handle) ACE_UNUSED_ARG (handle); return 0; #else -# if (defined(__BORLANDC__) && __BORLANDC__ < 0x0570) +# if defined (ACE_LACKS_INTPTR_T) int fd = ::_open_osfhandle (long (handle), 0); # else int fd = ::_open_osfhandle (intptr_t (handle), 0); diff --git a/ace/README b/ace/README index 860bc5dd252..f8492369934 100644 --- a/ace/README +++ b/ace/README @@ -720,6 +720,8 @@ ACE_HAS_VERBOSE_NOTSUP Prints out console message in tracking down origin of ACE_NOTSUP. +ACE_LACKS_INTPTR_T Platform lacks intptr_t type + ACE_HAS_INT8_T Platform provides the int8_t type. ACE_HAS_INT16_T Platform provides the int16_t type. ACE_HAS_INT32_T Platform provides the int32_t type. diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h index 099683fd72b..5ffb7d55649 100644 --- a/ace/config-win32-borland.h +++ b/ace/config-win32-borland.h @@ -87,6 +87,10 @@ # endif /* !_MT && !ACE_HAS_WINCE */ #endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */ +#if (__BORLANDC__ < 0x570) +# define ACE_LACKS_INTPTR_T +#endif + #if (__BORLANDC__ >= 0x600) # define ACE_LACKS_PTRDIFF_T # define ACE_PTRDIFF_T_TYPE std::ptrdiff_t diff --git a/ace/config-win32-msvc-6.h b/ace/config-win32-msvc-6.h index 4cc3cbfe20c..5808bbe16ec 100644 --- a/ace/config-win32-msvc-6.h +++ b/ace/config-win32-msvc-6.h @@ -70,6 +70,7 @@ # define ACE_HAS_SIG_ATOMIC_T # endif /* ACE_HAS_WINCE */ +# define ACE_LACKS_INTPTR_T // Compiler doesn't support static data member templates. # define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES |