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_signal.h
*
* @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
* $Id: OS_NS_signal.h 97246 2013-08-07 07:10:20Z johnnyw $
*
* @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
* @author Jesper S. M|ller<stophph@diku.dk>
* @author and a cast of thousands...
*
@ -41,6 +43,7 @@
* as macros on some platforms. This way macro definitions will
* be usable later as there is no way to save the macro definition
* using the pre-processor.
*
*/
#if !defined (ACE_LACKS_SIGSET)
@ -166,10 +169,6 @@ namespace ACE_OS {
int kill (pid_t pid,
int signum);
#ifdef pthread_sigmask
# define ACE_PTHREAD_SIGMASK_MACRO pthread_sigmask
# undef pthread_sigmask
#endif
ACE_NAMESPACE_INLINE_FUNCTION
int pthread_sigmask (int how,
const sigset_t *nsp,