Dep/ACE: Upgrade ACE -library to 5.8.3
--HG-- branch : trunk
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
*
|
||||
* memory management declarations
|
||||
*
|
||||
* $Id: os_mman.h 80826 2008-03-04 14:51:23Z wotte $
|
||||
* $Id: os_mman.h 91688 2010-09-09 11:21:50Z johnnyw $
|
||||
*
|
||||
* @author Don Hinton <[email protected]>
|
||||
* @author This code was originally in various places including ace/OS.h.
|
||||
@@ -31,14 +31,7 @@
|
||||
#endif /* ACE_LACKS_MMAP */
|
||||
|
||||
#if !defined (ACE_LACKS_SYS_MMAN_H)
|
||||
// Fixes a problem with HP/UX.
|
||||
# if defined (ACE_HAS_BROKEN_MMAP_H)
|
||||
extern "C" {
|
||||
# endif /* ACE_HAS_BROKEN_MMAP_H */
|
||||
# include /**/ <sys/mman.h>
|
||||
# if defined (ACE_HAS_BROKEN_MMAP_H)
|
||||
}
|
||||
# endif /* ACE_HAS_BROKEN_MMAP_H */
|
||||
#endif /* ACE_LACKS_SYS_MMAN_H */
|
||||
|
||||
// Place all additions (especially function declarations) within extern "C" {}
|
||||
@@ -88,13 +81,12 @@ PAGE_NOCACHE */
|
||||
# define ACE_MAP_FIXED MAP_FIXED
|
||||
# endif /* ! ACE_MAP_FIXED */
|
||||
|
||||
# if !defined (MAP_FAILED) || defined (ACE_HAS_BROKEN_MAP_FAILED)
|
||||
# undef MAP_FAILED
|
||||
# if !defined (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 || ACE_HAS_BROKEN_MAP_FAILED */
|
||||
# endif /* !MAP_FAILED */
|
||||
|
||||
#if !defined (PROT_RDWR)
|
||||
# define PROT_RDWR (PROT_READ|PROT_WRITE)
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
*
|
||||
* definitions for XSI resource operations
|
||||
*
|
||||
* $Id: os_resource.h 81697 2008-05-14 18:33:11Z johnnyw $
|
||||
* $Id: os_resource.h 91781 2010-09-15 12:49:15Z johnnyw $
|
||||
*
|
||||
* @author Don Hinton <[email protected]>
|
||||
* @author This code was originally in various places including ace/OS.h.
|
||||
@@ -52,13 +52,13 @@ extern "C"
|
||||
|
||||
// There must be a better way to do this...
|
||||
#if !defined (RLIMIT_NOFILE) && !defined (ACE_LACKS_RLIMIT_NOFILE)
|
||||
# if defined (linux) || defined (AIX) || defined (SCO)
|
||||
# if defined (linux) || defined (AIX)
|
||||
# if defined (RLIMIT_OFILE)
|
||||
# define RLIMIT_NOFILE RLIMIT_OFILE
|
||||
# else
|
||||
# define RLIMIT_NOFILE 200
|
||||
# endif /* RLIMIT_OFILE */
|
||||
# endif /* defined (linux) || defined (AIX) || defined (SCO) */
|
||||
# endif /* defined (linux) || defined (AIX) */
|
||||
#endif /* RLIMIT_NOFILE */
|
||||
|
||||
#if defined (ACE_WIN32)
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
*
|
||||
* main sockets header
|
||||
*
|
||||
* $Id: os_socket.h 85015 2009-04-03 12:27:59Z johnnyw $
|
||||
* $Id: os_socket.h 91781 2010-09-15 12:49:15Z johnnyw $
|
||||
*
|
||||
* @author Don Hinton <[email protected]>
|
||||
* @author This code was originally in various places including ace/OS.h.
|
||||
@@ -40,7 +40,7 @@ extern "C"
|
||||
{
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#if !defined (ACE_HAS_MSG) && !defined (SCO)
|
||||
#if !defined (ACE_HAS_MSG)
|
||||
struct msghdr {};
|
||||
#endif /* ACE_HAS_MSG */
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
*
|
||||
* data types
|
||||
*
|
||||
* $Id: os_types.h 88515 2010-01-13 08:47:38Z johnnyw $
|
||||
* $Id: os_types.h 91683 2010-09-09 09:07:49Z johnnyw $
|
||||
*
|
||||
* @author Don Hinton <[email protected]>
|
||||
* @author This code was originally in various places including ace/OS.h.
|
||||
@@ -74,7 +74,7 @@ typedef double ACE_timer_t;
|
||||
#elif defined (ACE_HAS_RTEMS) || defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__APPLE__) || defined(ACE_MVS) || defined(__INTERIX) || \
|
||||
(defined (ACE_OPENVMS) && defined (_LARGEFILE))
|
||||
typedef off_t ACE_LOFF_T;
|
||||
#elif defined (__sgi) || defined (AIX) || defined (HPUX) || defined (__QNX__)
|
||||
#elif defined (AIX) || defined (HPUX) || defined (__QNX__)
|
||||
typedef off64_t ACE_LOFF_T;
|
||||
#elif defined (__sun)
|
||||
typedef offset_t ACE_LOFF_T;
|
||||
|
||||
Reference in New Issue
Block a user