projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix some comments.
[gnulib.git]
/
lib
/
xstrtol.h
diff --git
a/lib/xstrtol.h
b/lib/xstrtol.h
index
9ac168b
..
516ac56
100644
(file)
--- a/
lib/xstrtol.h
+++ b/
lib/xstrtol.h
@@
-1,7
+1,7
@@
/* A more useful interface to strtol.
/* A more useful interface to strtol.
- Copyright (C) 1995
, 1996, 1998, 1999, 2001, 2002, 2003, 2004, 2006, 2007,
-
2008 Free Software
Foundation, Inc.
+ Copyright (C) 1995
-1996, 1998-1999, 2001-2004, 2006-2012 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
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_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;
LONGINT_INVALID = 4
};
typedef enum strtol_error strtol_error;
@@
-46,14
+46,9
@@
_DECLARE_XSTRTOL (xstrtoul, unsigned long int)
_DECLARE_XSTRTOL (xstrtoimax, intmax_t)
_DECLARE_XSTRTOL (xstrtoumax, uintmax_t)
_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.
#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. */
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_ */
#endif /* not XSTRTOL_H_ */