summaryrefslogtreecommitdiff
path: root/ace
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>1999-03-25 19:38:51 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>1999-03-25 19:38:51 +0000
commitfc216fe665ac13af56d0660a05e7f39843ea5761 (patch)
treec7f72035dd88439ed7aead472b4df6393decf00c /ace
parent6f101e7c4ffa65869c101f520d143d09880bd07b (diff)
downloadATCD-fc216fe665ac13af56d0660a05e7f39843ea5761.tar.gz
* ace/OS.h:
* ace/README: Added ACE_HAS_BROKEN_MAP_FAILED macro for platforms that do not cast MAP_FAILED to a (void *). Defining this macro prevents compilers on those platforms from complaining about assigning an int to a (void *). Thanks to Roland Gigler <roland@mch.pn.siemens.de> for providing feedback about this.
Diffstat (limited to 'ace')
-rw-r--r--ace/OS.h5
-rw-r--r--ace/README2
2 files changed, 5 insertions, 2 deletions
diff --git a/ace/OS.h b/ace/OS.h
index 49026e34524..badab07f086 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -4087,12 +4087,13 @@ typedef void *(*ACE_THR_C_FUNC)(void *);
# endif /* VXWORKS */
}
-# if !defined (MAP_FAILED)
+# if !defined (MAP_FAILED) || defined (ACE_HAS_BROKEN_MAP_FAILED)
+# undef MAP_FAILED
# define MAP_FAILED ((void *) -1)
# elif defined (ACE_HAS_LONG_MAP_FAILED)
# undef MAP_FAILED
# define MAP_FAILED ((void *) -1L)
-# endif /* MAP_FAILED */
+# endif /* !MAP_FAILED || ACE_HAS_BROKEN_MAP_FAILED */
# if defined (ACE_HAS_CHARPTR_DL)
typedef char * ACE_DL_TYPE;
diff --git a/ace/README b/ace/README
index b27ca2f069f..e76dbe330f0 100644
--- a/ace/README
+++ b/ace/README
@@ -186,6 +186,8 @@ ACE_HAS_BROKEN_ENUMS Compiler can't handle large
enums (e.g., HP/UX C++)
ACE_HAS_BROKEN_HPUX_TEMPLATES Earlier versions of HP/UX C++
are damned...
+ACE_HAS_BROKEN_MAP_FAILED Platform doesn't cast MAP_FAILED
+ to a void *.
ACE_HAS_BROKEN_MSG_H Platform headers don't support
<msg.h> prototypes
ACE_HAS_BROKEN_MMAP_H HP/UX does not wrap the