summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2003-10-16 18:07:48 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2003-10-16 18:07:48 +0000
commitb43df7e66422ae6d810843fa94a23e916ae68933 (patch)
tree8d5bc1475a407700f4c1cc880bb6eb97985e7ffd
parentd2be744b76f85ba7bdefa1721a7671f2a2d5be48 (diff)
downloadATCD-b43df7e66422ae6d810843fa94a23e916ae68933.tar.gz
ChangeLogTag: Thu Oct 16 18:07:13 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ace/Basic_Types.h4
-rw-r--r--ace/config-win32-borland.h5
2 files changed, 5 insertions, 4 deletions
diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h
index 4eed87af021..988bc3c2db8 100644
--- a/ace/Basic_Types.h
+++ b/ace/Basic_Types.h
@@ -255,11 +255,7 @@ typedef unsigned char ACE_Byte;
# if defined (ACE_HAS_WINCE) && (_WIN32_WCE < 400)
typedef unsigned long ptrdiff_t; // evc3, PocketPC don't defined ptrdiff_t
# endif
-# if defined(__BORLANDC__) && (__BORLANDC__ >= 0x600)
-typedef std::ptrdiff_t ptr_arith_t;
-# else
typedef ptrdiff_t ptr_arith_t;
-# endif /* __BORLANDC__ && __BORLANDC__ >= 0x600 */
// Byte-order (endian-ness) determination.
# if defined (BYTE_ORDER)
diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h
index 819f2e36642..774510e7b68 100644
--- a/ace/config-win32-borland.h
+++ b/ace/config-win32-borland.h
@@ -68,5 +68,10 @@
#define ACE_LACKS_STRRECVFD
+#if defined(__BORLANDC__) && (__BORLANDC__ >= 0x600)
+# define ACE_LACKS_PTRDIFF_T
+# define ACE_PTRDIFF_T_TYPE std::ptrdiff_t
+#endif
+
#include /**/ "ace/post.h"
#endif /* ACE_CONFIG_WIN32_BORLAND_H */