X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsig2str.h;h=03ff1e00cdc9a0588347973a0a6de502bf042a35;hb=34a0e456e514ba572223248a746ea3aa529b3e1d;hp=3a46a8ce850aac4239deecf0e317281fc61032c7;hpb=833bf615e55c2c7da116e82558364653766c1dce;p=gnulib.git

diff --git a/lib/sig2str.h b/lib/sig2str.h
index 3a46a8ce8..03ff1e00c 100644
--- a/lib/sig2str.h
+++ b/lib/sig2str.h
@@ -1,11 +1,11 @@
 /* sig2str.h -- convert between signal names and numbers
 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2009-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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,20 +13,16 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
-/* Include <signal.h> before including this file.  */
+#include <signal.h>
 
 /* Don't override system declarations of SIG2STR_MAX, sig2str, str2sig.  */
 #ifndef SIG2STR_MAX
 
-/* Upper bound on the string length of an integer converted to string.
-   302 / 1000 is ceil (log10 (2.0)).  Subtract 1 for the sign bit;
-   add 1 for integer division truncation; add 1 more for a minus sign.  */
-# define INT_STRLEN_BOUND(t) ((sizeof (t) * CHAR_BIT - 1) * 302 / 1000 + 2)
+# include "intprops.h"
 
 /* Size of a buffer needed to hold a signal name like "HUP".  */
 # define SIG2STR_MAX (sizeof "SIGRTMAX" + INT_STRLEN_BOUND (int) - 1)
@@ -42,8 +38,6 @@ int str2sig (char const *, int *);
 # define SIGNUM_BOUND (_sys_nsig - 1)
 #elif defined NSIG
 # define SIGNUM_BOUND (NSIG - 1)
-#elif defined WTERMSIG
-# define SIGNUM_BOUND WTERMSIG (~ 0)
 #else
-# define SIGNUM_BOUND 127
+# define SIGNUM_BOUND 64
 #endif