X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxstrtol.h;h=716a94ff9470f6c1af3e8bd2481e61820ab9e8f8;hb=70a72e0f50411ccc776379a761725d8c8bec58a3;hp=d96e34a062a17a6b9d085395782a38a7b33afbde;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git

diff --git a/lib/xstrtol.h b/lib/xstrtol.h
index d96e34a06..716a94ff9 100644
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -1,7 +1,7 @@
 /* A more useful interface to strtol.
 
-   Copyright (C) 1995, 1996, 1998, 1999, 2001, 2002, 2003, 2004, 2006, 2007
-   Free Software Foundation, Inc.
+   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
    it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ enum strtol_error
     LONGINT_INVALID_SUFFIX_CHAR = 2,
 
     LONGINT_INVALID_SUFFIX_CHAR_WITH_OVERFLOW = (LONGINT_INVALID_SUFFIX_CHAR
-						 | LONGINT_OVERFLOW),
+                                                 | LONGINT_OVERFLOW),
     LONGINT_INVALID = 4
   };
 typedef enum strtol_error strtol_error;
@@ -46,14 +46,15 @@ _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) || __STRICT_ANSI__
-#  define __attribute__(x)
-# endif
+#if HAVE_LONG_LONG_INT
+_DECLARE_XSTRTOL (xstrtoll, long long int)
+_DECLARE_XSTRTOL (xstrtoull, unsigned long long int)
 #endif
 
-#ifndef ATTRIBUTE_NORETURN
-# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
+# define _GL_ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+#else
+# define _GL_ATTRIBUTE_NORETURN /* empty */
 #endif
 
 /* Report an error for an invalid integer in an option argument.
@@ -72,7 +73,7 @@ _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;
+                    int, char, struct option const *,
+                    char const *) _GL_ATTRIBUTE_NORETURN;
 
 #endif /* not XSTRTOL_H_ */