X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxstrtol.h;h=ad134ab8b4dfc2eaf6d6f4096ed26f6b46caba1e;hb=1500d77252e6158b8e421de52f60057b0feedab8;hp=276deb8f16712336eb34332ca0f791e714185d20;hpb=3030c5b5e0a5199e16b05927da72c43c42f211c3;p=gnulib.git

diff --git a/lib/xstrtol.h b/lib/xstrtol.h
index 276deb8f1..ad134ab8b 100644
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -1,6 +1,6 @@
 /* A more useful interface to strtol.
 
-   Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2009 Free Software
+   Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2011 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -46,14 +46,9 @@ _DECLARE_XSTRTOL (xstrtoul, unsigned long int)
 _DECLARE_XSTRTOL (xstrtoimax, intmax_t)
 _DECLARE_XSTRTOL (xstrtoumax, uintmax_t)
 
-#ifndef __attribute__
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
-#  define __attribute__(x)
-# endif
-#endif
-
-#ifndef ATTRIBUTE_NORETURN
-# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+#if HAVE_LONG_LONG_INT
+_DECLARE_XSTRTOL (xstrtoll, long long int)
+_DECLARE_XSTRTOL (xstrtoull, unsigned long long int)
 #endif
 
 /* Report an error for an invalid integer in an option argument.
@@ -71,8 +66,8 @@ _DECLARE_XSTRTOL (xstrtoumax, uintmax_t)
 
    After reporting an error, exit with a failure status.  */
 
-void xstrtol_fatal (enum strtol_error,
-                    int, char, struct option const *,
-                    char const *) ATTRIBUTE_NORETURN;
+void _Noreturn xstrtol_fatal (enum strtol_error,
+                              int, char, struct option const *,
+                              char const *);
 
 #endif /* not XSTRTOL_H_ */