Some missing from merge.

Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-05 14:54:07 +02:00 committed by Antz
parent ec939a5bce
commit f4be15a7af
1895 changed files with 160408 additions and 53601 deletions

View file

@ -4,7 +4,9 @@
/**
* @file OS_NS_stdlib.h
*
* @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
* $Id: OS_NS_stdlib.h 97921 2014-10-10 21:58:31Z shuston $
*
* @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
* @author Jesper S. M|ller<stophph@diku.dk>
* @author and a cast of thousands...
*
@ -46,6 +48,11 @@ extern "C" {
}
#endif /* ACE_WIN32 && _MSC_VER */
// FreeBSD has atop macro (not related to ACE_OS::atop)
#if defined (atop)
# undef atop
#endif
/*
* We inline and undef some functions that may be implemented
* as macros on some platforms. This way macro definitions will
@ -77,18 +84,6 @@ inline ACE_INT64 ace_strtoull_helper (const char *s, char **ptr, int base)
}
#endif /* !ACE_LACKS_STRTOULL && !ACE_STRTOULL_EQUIVALENT */
#if !defined (ACE_LACKS_RAND_R)
inline int ace_rand_r_helper (unsigned *seed)
{
# if defined (rand_r)
return rand_r (seed);
# undef rand_r
# else
return ACE_STD_NAMESPACE::rand_r (seed);
# endif /* rand_r */
}
#endif /* !ACE_LACKS_RAND_R */
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE_OS {