projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* getloadavg.c: Sync with Emacs and then change to conform to GNU coding style.
[gnulib.git]
/
lib
/
xstrtol.h
diff --git
a/lib/xstrtol.h
b/lib/xstrtol.h
index
513855f
..
9af90aa
100644
(file)
--- a/
lib/xstrtol.h
+++ b/
lib/xstrtol.h
@@
-1,5
+1,7
@@
/* A more useful interface to strtol.
/* A more useful interface to strtol.
- Copyright 1995, 1996, 1998, 1999, 2001 Free Software Foundation, Inc.
+
+ Copyright (C) 1995, 1996, 1998, 1999, 2001, 2002, 2003 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
@@
-18,15
+20,12
@@
#ifndef XSTRTOL_H_
# define XSTRTOL_H_ 1
#ifndef XSTRTOL_H_
# define XSTRTOL_H_ 1
+/* Get uintmax_t. */
# if HAVE_INTTYPES_H
# if HAVE_INTTYPES_H
-# include <inttypes.h> /* for uintmax_t */
-# endif
-
-# ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-# define PARAMS(Args) Args
-# else
-# define PARAMS(Args) ()
+# include <inttypes.h>
+# else
+# if HAVE_STDINT_H
+# include <stdint.h>
# endif
# endif
# endif
# endif
@@
-39,9
+38,7
@@
typedef enum strtol_error strtol_error;
# endif
# define _DECLARE_XSTRTOL(name, type) \
# endif
# define _DECLARE_XSTRTOL(name, type) \
- strtol_error \
- name PARAMS ((const char *s, char **ptr, int base, \
- type *val, const char *valid_suffixes));
+ strtol_error name (const char *, char **, int, type *, const char *);
_DECLARE_XSTRTOL (xstrtol, long int)
_DECLARE_XSTRTOL (xstrtoul, unsigned long int)
_DECLARE_XSTRTOL (xstrtoimax, intmax_t)
_DECLARE_XSTRTOL (xstrtol, long int)
_DECLARE_XSTRTOL (xstrtoul, unsigned long int)
_DECLARE_XSTRTOL (xstrtoimax, intmax_t)