Diff for /embedaddon/libiconv/srclib/signal.in.h between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 22:57:48 version 1.1.1.2, 2012/05/29 09:29:43
Line 1 Line 1
 /* A GNU-like <signal.h>.  /* A GNU-like <signal.h>.
   
   Copyright (C) 2006-2009 Free Software Foundation, Inc.   Copyright (C) 2006-2011 Free Software Foundation, Inc.
   
    This program is free software: you can redistribute it and/or modify     This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by     it under the terms of the GNU General Public License as published by
Line 18 Line 18
 #if __GNUC__ >= 3  #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@  @PRAGMA_SYSTEM_HEADER@
 #endif  #endif
   @PRAGMA_COLUMNS@
   
#if defined __need_sig_atomic_t || defined __need_sigset_t#if defined __need_sig_atomic_t || defined __need_sigset_t || defined _GL_ALREADY_INCLUDING_SIGNAL_H || (defined _SIGNAL_H && !defined __SIZEOF_PTHREAD_MUTEX_T)
/* Special invocation convention inside glibc header files.  *//* Special invocation convention:
    - Inside glibc header files.
    - On glibc systems we have a sequence of nested includes
      <signal.h> -> <ucontext.h> -> <signal.h>.
      In this situation, the functions are not yet declared, therefore we cannot
      provide the C++ aliases.
    - On glibc systems with GCC 4.3 we have a sequence of nested includes
      <csignal> -> </usr/include/signal.h> -> <sys/ucontext.h> -> <signal.h>.
      In this situation, some of the functions are not yet declared, therefore
      we cannot provide the C++ aliases.  */
   
 # @INCLUDE_NEXT@ @NEXT_SIGNAL_H@  # @INCLUDE_NEXT@ @NEXT_SIGNAL_H@
   
 #else  #else
 /* Normal invocation convention.  */  /* Normal invocation convention.  */
   
#ifndef _GL_SIGNAL_H#ifndef _@GUARD_PREFIX@_SIGNAL_H
   
   #define _GL_ALREADY_INCLUDING_SIGNAL_H
   
   /* Define pid_t, uid_t.
      Also, mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.
      On Solaris 10, <signal.h> includes <sys/types.h>, which eventually includes
      us; so include <sys/types.h> now, before the second inclusion guard.  */
   #include <sys/types.h>
   
 /* The include_next requires a split double-inclusion guard.  */  /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_SIGNAL_H@  #@INCLUDE_NEXT@ @NEXT_SIGNAL_H@
   
#ifndef _GL_SIGNAL_H#undef _GL_ALREADY_INCLUDING_SIGNAL_H
#define _GL_SIGNAL_H 
   
/* The definition of GL_LINK_WARNING is copied here.  */#ifndef _@GUARD_PREFIX@_SIGNAL_H
 #define _@GUARD_PREFIX@_SIGNAL_H
   
/* Define pid_t, uid_t./* MacOS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6 declare
   Also, mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.  */   pthread_sigmask in <pthread.h>, not in <signal.h>.
#include <sys/types.h>   But avoid namespace pollution on glibc systems.*/
 #if (@GNULIB_PTHREAD_SIGMASK@ || defined GNULIB_POSIXCHECK) \
     && ((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __OpenBSD__ || defined __osf__ || defined __sun) \
     && ! defined __GLIBC__
 # include <pthread.h>
 #endif
   
   /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
   
   /* The definition of _GL_ARG_NONNULL is copied here.  */
   
   /* The definition of _GL_WARN_ON_USE is copied here.  */
   
 /* On AIX, sig_atomic_t already includes volatile.  C99 requires that  /* On AIX, sig_atomic_t already includes volatile.  C99 requires that
    'volatile sig_atomic_t' ignore the extra modifier, but C89 did not.     'volatile sig_atomic_t' ignore the extra modifier, but C89 did not.
    Hence, redefine this to a non-volatile type as needed.  */     Hence, redefine this to a non-volatile type as needed.  */
 #if ! @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@  #if ! @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
   # if !GNULIB_defined_sig_atomic_t
 typedef int rpl_sig_atomic_t;  typedef int rpl_sig_atomic_t;
# undef sig_atomic_t#  undef sig_atomic_t
define sig_atomic_t rpl_sig_atomic_t#  define sig_atomic_t rpl_sig_atomic_t
 #  define GNULIB_defined_sig_atomic_t 1
 # endif
 #endif  #endif
   
#ifdef __cplusplus/* A set or mask of signals.  */
 #if !@HAVE_SIGSET_T@
 # if !GNULIB_defined_sigset_t
 typedef unsigned int sigset_t;
 #  define GNULIB_defined_sigset_t 1
 # endif
 #endif
 
 /* Define sighandler_t, the type of signal handlers.  A GNU extension.  */
 #if !@HAVE_SIGHANDLER_T@
 # ifdef __cplusplus
 extern "C" {  extern "C" {
   # endif
   # if !GNULIB_defined_sighandler_t
   typedef void (*sighandler_t) (int);
   #  define GNULIB_defined_sighandler_t 1
   # endif
   # ifdef __cplusplus
   }
   # endif
 #endif  #endif
   
   
Line 66  extern "C" { Line 116  extern "C" {
 #endif  #endif
   
   
 #if !@HAVE_POSIX_SIGNALBLOCKING@  
   
 /* Maximum signal number + 1.  */  /* Maximum signal number + 1.  */
# ifndef NSIG#ifndef NSIG
 # if defined __TANDEM
 #  define NSIG 32  #  define NSIG 32
 # endif  # endif
   #endif
   
   
   #if @GNULIB_PTHREAD_SIGMASK@
   # if @REPLACE_PTHREAD_SIGMASK@
   #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
   #   undef pthread_sigmask
   #   define pthread_sigmask rpl_pthread_sigmask
   #  endif
   _GL_FUNCDECL_RPL (pthread_sigmask, int,
                     (int how, const sigset_t *new_mask, sigset_t *old_mask));
   _GL_CXXALIAS_RPL (pthread_sigmask, int,
                     (int how, const sigset_t *new_mask, sigset_t *old_mask));
   # else
   #  if !@HAVE_PTHREAD_SIGMASK@
   _GL_FUNCDECL_SYS (pthread_sigmask, int,
                     (int how, const sigset_t *new_mask, sigset_t *old_mask));
   #  endif
   _GL_CXXALIAS_SYS (pthread_sigmask, int,
                     (int how, const sigset_t *new_mask, sigset_t *old_mask));
   # endif
   _GL_CXXALIASWARN (pthread_sigmask);
   #elif defined GNULIB_POSIXCHECK
   # undef pthread_sigmask
   # if HAVE_RAW_DECL_PTHREAD_SIGMASK
   _GL_WARN_ON_USE (pthread_sigmask, "pthread_sigmask is not portable - "
                    "use gnulib module pthread_sigmask for portability");
   # endif
   #endif
   
   
   #if @GNULIB_SIGPROCMASK@
   # if !@HAVE_POSIX_SIGNALBLOCKING@
   
   /* Maximum signal number + 1.  */
   #  ifndef NSIG
   #   define NSIG 32
   #  endif
   
 /* This code supports only 32 signals.  */  /* This code supports only 32 signals.  */
typedef int verify_NSIG_constraint[2 * (NSIG <= 32) - 1];#  if !GNULIB_defined_verify_NSIG_constraint
 typedef int verify_NSIG_constraint[NSIG <= 32 ? 1 : -1];
 #   define GNULIB_defined_verify_NSIG_constraint 1
 #  endif
   
 /* A set or mask of signals.  */  
 # if !@HAVE_SIGSET_T@  
 typedef unsigned int sigset_t;  
 # endif  # endif
   
 /* Test whether a given signal is contained in a signal set.  */  /* Test whether a given signal is contained in a signal set.  */
extern int sigismember (const sigset_t *set, int sig);# if @HAVE_POSIX_SIGNALBLOCKING@
 /* This function is defined as a macro on MacOS X.  */
 #  if defined __cplusplus && defined GNULIB_NAMESPACE
 #   undef sigismember
 #  endif
 # else
 _GL_FUNCDECL_SYS (sigismember, int, (const sigset_t *set, int sig)
                                     _GL_ARG_NONNULL ((1)));
 # endif
 _GL_CXXALIAS_SYS (sigismember, int, (const sigset_t *set, int sig));
 _GL_CXXALIASWARN (sigismember);
   
 /* Initialize a signal set to the empty set.  */  /* Initialize a signal set to the empty set.  */
extern int sigemptyset (sigset_t *set);# if @HAVE_POSIX_SIGNALBLOCKING@
 /* This function is defined as a macro on MacOS X.  */
 #  if defined __cplusplus && defined GNULIB_NAMESPACE
 #   undef sigemptyset
 #  endif
 # else
 _GL_FUNCDECL_SYS (sigemptyset, int, (sigset_t *set) _GL_ARG_NONNULL ((1)));
 # endif
 _GL_CXXALIAS_SYS (sigemptyset, int, (sigset_t *set));
 _GL_CXXALIASWARN (sigemptyset);
   
 /* Add a signal to a signal set.  */  /* Add a signal to a signal set.  */
extern int sigaddset (sigset_t *set, int sig);# if @HAVE_POSIX_SIGNALBLOCKING@
 /* This function is defined as a macro on MacOS X.  */
 #  if defined __cplusplus && defined GNULIB_NAMESPACE
 #   undef sigaddset
 #  endif
 # else
 _GL_FUNCDECL_SYS (sigaddset, int, (sigset_t *set, int sig)
                                   _GL_ARG_NONNULL ((1)));
 # endif
 _GL_CXXALIAS_SYS (sigaddset, int, (sigset_t *set, int sig));
 _GL_CXXALIASWARN (sigaddset);
   
 /* Remove a signal from a signal set.  */  /* Remove a signal from a signal set.  */
extern int sigdelset (sigset_t *set, int sig);# if @HAVE_POSIX_SIGNALBLOCKING@
 /* This function is defined as a macro on MacOS X.  */
 #  if defined __cplusplus && defined GNULIB_NAMESPACE
 #   undef sigdelset
 #  endif
 # else
 _GL_FUNCDECL_SYS (sigdelset, int, (sigset_t *set, int sig)
                                   _GL_ARG_NONNULL ((1)));
 # endif
 _GL_CXXALIAS_SYS (sigdelset, int, (sigset_t *set, int sig));
 _GL_CXXALIASWARN (sigdelset);
   
 /* Fill a signal set with all possible signals.  */  /* Fill a signal set with all possible signals.  */
extern int sigfillset (sigset_t *set);# if @HAVE_POSIX_SIGNALBLOCKING@
 /* This function is defined as a macro on MacOS X.  */
 #  if defined __cplusplus && defined GNULIB_NAMESPACE
 #   undef sigfillset
 #  endif
 # else
 _GL_FUNCDECL_SYS (sigfillset, int, (sigset_t *set) _GL_ARG_NONNULL ((1)));
 # endif
 _GL_CXXALIAS_SYS (sigfillset, int, (sigset_t *set));
 _GL_CXXALIASWARN (sigfillset);
   
 /* Return the set of those blocked signals that are pending.  */  /* Return the set of those blocked signals that are pending.  */
extern int sigpending (sigset_t *set);# if !@HAVE_POSIX_SIGNALBLOCKING@
 _GL_FUNCDECL_SYS (sigpending, int, (sigset_t *set) _GL_ARG_NONNULL ((1)));
 # endif
 _GL_CXXALIAS_SYS (sigpending, int, (sigset_t *set));
 _GL_CXXALIASWARN (sigpending);
   
 /* If OLD_SET is not NULL, put the current set of blocked signals in *OLD_SET.  /* If OLD_SET is not NULL, put the current set of blocked signals in *OLD_SET.
    Then, if SET is not NULL, affect the current set of blocked signals by     Then, if SET is not NULL, affect the current set of blocked signals by
    combining it with *SET as indicated in OPERATION.     combining it with *SET as indicated in OPERATION.
    In this implementation, you are not allowed to change a signal handler     In this implementation, you are not allowed to change a signal handler
    while the signal is blocked.  */     while the signal is blocked.  */
# define SIG_BLOCK   0  /* blocked_set = blocked_set | *set; */# if !@HAVE_POSIX_SIGNALBLOCKING@
define SIG_SETMASK 1  /* blocked_set = *set; */#  define SIG_BLOCK   0  /* blocked_set = blocked_set | *set; */
define SIG_UNBLOCK 2  /* blocked_set = blocked_set & ~*set; */#  define SIG_SETMASK 1  /* blocked_set = *set; */
extern int sigprocmask (int operation, const sigset_t *set, sigset_t *old_set);#  define SIG_UNBLOCK 2  /* blocked_set = blocked_set & ~*set; */
 _GL_FUNCDECL_SYS (sigprocmask, int,
                   (int operation, const sigset_t *set, sigset_t *old_set));
 # endif
 _GL_CXXALIAS_SYS (sigprocmask, int,
                   (int operation, const sigset_t *set, sigset_t *old_set));
 _GL_CXXALIASWARN (sigprocmask);
   
 # define signal rpl_signal  
 /* Install the handler FUNC for signal SIG, and return the previous  /* Install the handler FUNC for signal SIG, and return the previous
    handler.  */     handler.  */
extern void (*signal (int sig, void (*func) (int))) (int);# ifdef __cplusplus
 extern "C" {
 # endif
 # if !GNULIB_defined_function_taking_int_returning_void_t
 typedef void (*_gl_function_taking_int_returning_void_t) (int);
 #  define GNULIB_defined_function_taking_int_returning_void_t 1
 # endif
 # ifdef __cplusplus
 }
 # endif
 # if !@HAVE_POSIX_SIGNALBLOCKING@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define signal rpl_signal
 #  endif
 _GL_FUNCDECL_RPL (signal, _gl_function_taking_int_returning_void_t,
                   (int sig, _gl_function_taking_int_returning_void_t func));
 _GL_CXXALIAS_RPL (signal, _gl_function_taking_int_returning_void_t,
                   (int sig, _gl_function_taking_int_returning_void_t func));
 # else
 _GL_CXXALIAS_SYS (signal, _gl_function_taking_int_returning_void_t,
                   (int sig, _gl_function_taking_int_returning_void_t func));
 # endif
 _GL_CXXALIASWARN (signal);
   
 # if GNULIB_defined_SIGPIPE  
   
 /* Raise signal SIG.  */  /* Raise signal SIG.  */
#  undef raise# if !@HAVE_POSIX_SIGNALBLOCKING@ && GNULIB_defined_SIGPIPE
#  define raise rpl_raise#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
extern int raise (int sig); 
 #   define raise rpl_raise
 #  endif
 _GL_FUNCDECL_RPL (raise, int, (int sig));
 _GL_CXXALIAS_RPL (raise, int, (int sig));
 # else
 _GL_CXXALIAS_SYS (raise, int, (int sig));
 # endif
 _GL_CXXALIASWARN (raise);
   
   #elif defined GNULIB_POSIXCHECK
   # undef sigaddset
   # if HAVE_RAW_DECL_SIGADDSET
   _GL_WARN_ON_USE (sigaddset, "sigaddset is unportable - "
                    "use the gnulib module sigprocmask for portability");
 # endif  # endif
   # undef sigdelset
   # if HAVE_RAW_DECL_SIGDELSET
   _GL_WARN_ON_USE (sigdelset, "sigdelset is unportable - "
                    "use the gnulib module sigprocmask for portability");
   # endif
   # undef sigemptyset
   # if HAVE_RAW_DECL_SIGEMPTYSET
   _GL_WARN_ON_USE (sigemptyset, "sigemptyset is unportable - "
                    "use the gnulib module sigprocmask for portability");
   # endif
   # undef sigfillset
   # if HAVE_RAW_DECL_SIGFILLSET
   _GL_WARN_ON_USE (sigfillset, "sigfillset is unportable - "
                    "use the gnulib module sigprocmask for portability");
   # endif
   # undef sigismember
   # if HAVE_RAW_DECL_SIGISMEMBER
   _GL_WARN_ON_USE (sigismember, "sigismember is unportable - "
                    "use the gnulib module sigprocmask for portability");
   # endif
   # undef sigpending
   # if HAVE_RAW_DECL_SIGPENDING
   _GL_WARN_ON_USE (sigpending, "sigpending is unportable - "
                    "use the gnulib module sigprocmask for portability");
   # endif
   # undef sigprocmask
   # if HAVE_RAW_DECL_SIGPROCMASK
   _GL_WARN_ON_USE (sigprocmask, "sigprocmask is unportable - "
                    "use the gnulib module sigprocmask for portability");
   # endif
   #endif /* @GNULIB_SIGPROCMASK@ */
   
 #endif /* !@HAVE_POSIX_SIGNALBLOCKING@ */  
   
   #if @GNULIB_SIGACTION@
   # if !@HAVE_SIGACTION@
   
#if !@HAVE_SIGACTION@#  if !@HAVE_SIGINFO_T@
   
# if !@HAVE_SIGINFO_T@#   if !GNULIB_defined_siginfo_types
 
 /* Present to allow compilation, but unsupported by gnulib.  */  /* Present to allow compilation, but unsupported by gnulib.  */
 union sigval  union sigval
 {  {
Line 150  struct siginfo_t Line 360  struct siginfo_t
   union sigval si_value;    union sigval si_value;
 };  };
 typedef struct siginfo_t siginfo_t;  typedef struct siginfo_t siginfo_t;
 # endif /* !@HAVE_SIGINFO_T@ */  
   
   #    define GNULIB_defined_siginfo_types 1
   #   endif
   
   #  endif /* !@HAVE_SIGINFO_T@ */
   
 /* We assume that platforms which lack the sigaction() function also lack  /* We assume that platforms which lack the sigaction() function also lack
    the 'struct sigaction' type, and vice versa.  */     the 'struct sigaction' type, and vice versa.  */
   
   #  if !GNULIB_defined_struct_sigaction
   
 struct sigaction  struct sigaction
 {  {
   union    union
Line 170  struct sigaction Line 386  struct sigaction
   /* Not all POSIX flags are supported.  */    /* Not all POSIX flags are supported.  */
   int sa_flags;    int sa_flags;
 };  };
# define sa_handler _sa_func._sa_handler#   define sa_handler _sa_func._sa_handler
define sa_sigaction _sa_func._sa_sigaction   /* Unsupported flags are not present.  */
 /* Unsupported flags are not present.  */  /* Unsupported flags are not present.  */
# define SA_RESETHAND 1#   define SA_RESETHAND 1
define SA_NODEFER 2#   define SA_NODEFER 2
define SA_RESTART 4 
   
extern int sigaction (int, const struct sigaction *restrict,#   define GNULIB_defined_struct_sigaction 1
                      struct sigaction *restrict);#  endif
   
#elif !@HAVE_STRUCT_SIGACTION_SA_SIGACTION@_GL_FUNCDECL_SYS (sigaction, int, (int, const struct sigaction *restrict,
                                    struct sigaction *restrict));
   
# define sa_sigaction sa_handler# elif !@HAVE_STRUCT_SIGACTION_SA_SIGACTION@
   
#endif /* !@HAVE_SIGACTION@, !@HAVE_STRUCT_SIGACTION_SA_SIGACTION@ */#  define sa_sigaction sa_handler
   
   # endif /* !@HAVE_SIGACTION@, !@HAVE_STRUCT_SIGACTION_SA_SIGACTION@ */
   
   _GL_CXXALIAS_SYS (sigaction, int, (int, const struct sigaction *restrict,
                                      struct sigaction *restrict));
   _GL_CXXALIASWARN (sigaction);
   
   #elif defined GNULIB_POSIXCHECK
   # undef sigaction
   # if HAVE_RAW_DECL_SIGACTION
   _GL_WARN_ON_USE (sigaction, "sigaction is unportable - "
                    "use the gnulib module sigaction for portability");
   # endif
   #endif
   
 /* Some systems don't have SA_NODEFER.  */  /* Some systems don't have SA_NODEFER.  */
 #ifndef SA_NODEFER  #ifndef SA_NODEFER
 # define SA_NODEFER 0  # define SA_NODEFER 0
 #endif  #endif
   
   
#ifdef __cplusplus#endif /* _@GUARD_PREFIX@_SIGNAL_H */
}#endif /* _@GUARD_PREFIX@_SIGNAL_H */
#endif 
 
#endif /* _GL_SIGNAL_H */ 
#endif /* _GL_SIGNAL_H */ 
 #endif  #endif

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>