projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NEWS.stable: log cherry-pick [24bfc89]->[1d71dc7] strtoumax: Avoid link error on...
[gnulib.git]
/
lib
/
error.c
diff --git
a/lib/error.c
b/lib/error.c
index
ed9dba0
..
7482baa
100644
(file)
--- a/
lib/error.c
+++ b/
lib/error.c
@@
-1,5
+1,5
@@
/* Error handler for noninteractive utilities
/* Error handler for noninteractive utilities
- Copyright (C) 1990-1998, 2000-2007, 2009-201
0
Free Software Foundation, Inc.
+ Copyright (C) 1990-1998, 2000-2007, 2009-201
1
Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software: you can redistribute it and/or modify
This file is part of the GNU C Library.
This program is free software: you can redistribute it and/or modify
@@
-97,11
+97,15
@@
extern void __error_at_line (int status, int errnum, const char *file_name,
/* The gnulib override of fcntl is not needed in this file. */
# undef fcntl
/* The gnulib override of fcntl is not needed in this file. */
# undef fcntl
-# if !HAVE_DECL_STRERROR_R
&& STRERROR_R_CHAR_P
+# if !HAVE_DECL_STRERROR_R
# ifndef HAVE_DECL_STRERROR_R
"this configure-time declaration test was not run"
# endif
# ifndef HAVE_DECL_STRERROR_R
"this configure-time declaration test was not run"
# endif
+# if STRERROR_R_CHAR_P
char *strerror_r ();
char *strerror_r ();
+# else
+int strerror_r ();
+# endif
# endif
/* The calling program should define program_name and set it to the
# endif
/* The calling program should define program_name and set it to the