mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 22:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[12072] Apply ACE patches for FreeBSD

Browse source
This commit is contained in:
antiroot 2012-07-27 10:43:03 -05:00
parent 7dc0a86237
commit 2c7ba84313
5 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dep/ACE_wrappers/ace/OS_NS_Thread.h
View file

@ -38,6 +38,12 @@
# include "ace/ACE_export.h" # include "ace/ACE_export.h"
# include "ace/Object_Manager_Base.h" # include "ace/Object_Manager_Base.h"
# include <sys/param.h>
#if (defined(__FreeBSD__) && ((__FreeBSD_version >= 700110 && __FreeBSD_version < 800000) || __FreeBSD_version >= 800024))
# include <sys/cpuset.h>
# define cpu_set_t cpuset_t
#endif
# if defined (ACE_EXPORT_MACRO) # if defined (ACE_EXPORT_MACRO)
# undef ACE_EXPORT_MACRO # undef ACE_EXPORT_MACRO
# endif # endif

12
dep/ACE_wrappers/ace/OS_NS_netdb.inl
View file

@ -6,6 +6,8 @@
#include "ace/OS_NS_string.h" #include "ace/OS_NS_string.h"
#include "ace/OS_NS_errno.h" #include "ace/OS_NS_errno.h"
#include <sys/param.h>
#if defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS) #if defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS)
# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
# define ACE_NETDBCALL_RETURN(OP,TYPE,FAILVALUE,TARGET,SIZE) \ # define ACE_NETDBCALL_RETURN(OP,TYPE,FAILVALUE,TARGET,SIZE) \
@ -125,7 +127,7 @@ ACE_OS::gethostbyaddr_r (const char *addr,
*h_errnop = h_errno; *h_errnop = h_errno;
return (struct hostent *) 0; return (struct hostent *) 0;
} }
# elif defined (__GLIBC__) # elif defined (__GLIBC__) || (defined(__FreeBSD__) && __FreeBSD_version >= 700015)
// GNU C library has a different signature // GNU C library has a different signature
ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA)); ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA));
@ -317,7 +319,7 @@ ACE_OS::gethostbyname_r (const char *name,
*h_errnop = h_errno; *h_errnop = h_errno;
return (struct hostent *) 0; return (struct hostent *) 0;
} }
# elif defined (__GLIBC__) # elif defined (__GLIBC__) || (defined(__FreeBSD__) && __FreeBSD_version >= 700015)
// GNU C library has a different signature // GNU C library has a different signature
ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA)); ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA));
@ -531,7 +533,7 @@ ACE_OS::getprotobyname_r (const char *name,
else else
return 0; return 0;
//FUZZ: enable check_for_lack_ACE_OS //FUZZ: enable check_for_lack_ACE_OS
# elif defined (__GLIBC__) # elif defined (__GLIBC__) || (defined(__FreeBSD__) && __FreeBSD_version >= 700015)
// GNU C library has a different signature // GNU C library has a different signature
//FUZZ: disable check_for_lack_ACE_OS //FUZZ: disable check_for_lack_ACE_OS
if (::getprotobyname_r (name, if (::getprotobyname_r (name,
@ -612,7 +614,7 @@ ACE_OS::getprotobynumber_r (int proto,
//FUZZ: enable check_for_lack_ACE_OS //FUZZ: enable check_for_lack_ACE_OS
else else
return 0; return 0;
# elif defined (__GLIBC__) # elif defined (__GLIBC__) || (defined(__FreeBSD__) && __FreeBSD_version >= 700015)
// GNU C library has a different signature // GNU C library has a different signature
//FUZZ: disable check_for_lack_ACE_OS //FUZZ: disable check_for_lack_ACE_OS
if (::getprotobynumber_r (proto, if (::getprotobynumber_r (proto,
@ -698,7 +700,7 @@ ACE_OS::getservbyname_r (const char *svc,
//FUZZ: enable check_for_lack_ACE_OS //FUZZ: enable check_for_lack_ACE_OS
else else
return (struct servent *) 0; return (struct servent *) 0;
# elif defined (__GLIBC__) # elif defined (__GLIBC__) || (defined(__FreeBSD__) && __FreeBSD_version >= 700015)
// GNU C library has a different signature // GNU C library has a different signature
ACE_OS::memset (buf, 0, sizeof (ACE_SERVENT_DATA)); ACE_OS::memset (buf, 0, sizeof (ACE_SERVENT_DATA));

6
dep/ACE_wrappers/ace/OS_NS_signal.h
View file

@ -33,10 +33,10 @@
#endif #endif
#define ACE_EXPORT_MACRO ACE_Export #define ACE_EXPORT_MACRO ACE_Export
#if defined (__Lynx__) #if defined (__Lynx__) || defined (__OpenBSD__) || defined (__FreeBSD__)
// LynxOS defines pthread_sigmask() in pthread.h // LynxOS, OpenBSD and FreeBSD define pthread_sigmask() in pthread.h
# include "ace/os_include/os_pthread.h" # include "ace/os_include/os_pthread.h"
#endif /* __Lynx__ */ #endif /* __Lynx__ || OpenBSD || FreeBSD */
/* /*
* We inline and undef some functions that may be implemented * We inline and undef some functions that may be implemented

4
dep/ACE_wrappers/ace/os_include/os_pthread.h
View file

@ -299,7 +299,11 @@
# undef THR_DAEMON # undef THR_DAEMON
# define THR_BOUND 0x00000001 # define THR_BOUND 0x00000001
# if defined (__FreeBSD__)
# define THR_NEW_LWP 0x00000000
# else
# define THR_NEW_LWP 0x00000002 # define THR_NEW_LWP 0x00000002
# endif
# define THR_DETACHED 0x00000040 # define THR_DETACHED 0x00000040
# define THR_SUSPENDED 0x00000080 # define THR_SUSPENDED 0x00000080
# define THR_DAEMON 0x00000100 # define THR_DAEMON 0x00000100

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "12071" #define REVISION_NR "12072"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__