summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2016-11-27 19:52:08 +0100
committerBruno Haible <bruno@clisp.org>2016-11-27 19:52:08 +0100
commit13df195c6217c43981e79515515ba8fda13a644d (patch)
treed9d384d5015fc65ad1ded84255bc6e8bd4a331bc
parentcabd2af10e509b7889b57f9ef21ec3e08e85c8e6 (diff)
downloadgperf-13df195c6217c43981e79515515ba8fda13a644d.tar.gz
Tweak last commit.
-rw-r--r--ChangeLog4
-rw-r--r--lib/getopt.c6
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0c82d74..687b364 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,8 @@
Assume the available C compiler supports ANSI C. Remove K&R C cruft.
* lib/getopt.h: Assume 'const' is defined. Use ANSI C prototypes.
- * lib/getopt.c: Assume 'const' is defined, 'strlen' is declared. Use
- ANSI C prototypes.
+ * lib/getopt.c: Assume 'const' is defined. Use ANSI C prototypes.
+ Include <stddef.h>. Declare strcmp and strlen.
* lib/getopt1.c: Assume 'const' and NULL are defined. Use ANSI C
prototypes.
* lib/getopt.h.patch: Remove file.
diff --git a/lib/getopt.c b/lib/getopt.c
index 9e7d2f4..b95002a 100644
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -50,6 +50,9 @@
#ifndef ELIDE_CODE
+/* Get size_t. */
+#include <stddef.h>
+
/* This needs to come after some library #include
to get __GNU_LIBRARY__ defined. */
#ifdef __GNU_LIBRARY__
@@ -206,6 +209,9 @@ my_index (const char *str, int chr)
return 0;
}
+extern int strcmp (const char *, const char *);
+extern size_t strlen (const char *);
+
#endif /* not __GNU_LIBRARY__ */
/* Handle permutation of arguments. */