9 files changed, 29 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 32cbb65abd..62f5136c33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2012-02-18  Rafe Kettler  <rafe.kettler@gmail.com>
+
+	[BZ #13058]
+	* manual/examples/argp-ex1.c (main): Format definition in GNU
+	style.
+	* manual/examples/argp-ex2.c (main): Likewise.
+	* manual/examples/argp-ex3.c (main): Likewise.
+	* manual/examples/argp-ex4.c (main): Likewise.
+	* manual/examples/longopt.c (main): Use new-style prototype
+	definition.
+	* manual/examples/strncat.c (main): Specify return type and use
+	(void) for arguments.
+	* manual/examples/subopt.c (main): Use char **argv argument.
+
 2012-02-17  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #5077]
diff --git a/NEWS b/NEWS
index 3b97e5c2ea..6b1c024857 100644
--- a/NEWS
+++ b/NEWS
@@ -10,8 +10,9 @@ Version 2.16
 * The following bugs are resolved with this release:
 
   174, 350, 411, 3335, 4026, 4822, 5077, 5805, 6884, 6907, 9902, 10140,
-  10210, 11494, 12047, 13525, 13526, 13527, 13528, 13529, 13530, 13531,
-  13532, 13533, 13547, 13551, 13552, 13553, 13555, 13559, 13583, 13618
+  10210, 11494, 12047, 13058, 13525, 13526, 13527, 13528, 13529, 13530,
+  13531, 13532, 13533, 13547, 13551, 13552, 13553, 13555, 13559, 13583,
+  13618
 
 * ISO C11 support:
 
diff --git a/manual/examples/argp-ex1.c b/manual/examples/argp-ex1.c
index 7bb5f2241c..931a8264a5 100644
--- a/manual/examples/argp-ex1.c
+++ b/manual/examples/argp-ex1.c
@@ -8,7 +8,8 @@
 #include <stdlib.h>
 #include <argp.h>
 
-int main (int argc, char **argv)
+int
+main (int argc, char **argv)
 {
   argp_parse (0, argc, argv, 0, 0, 0);
   exit (0);
diff --git a/manual/examples/argp-ex2.c b/manual/examples/argp-ex2.c
index c49fbaca94..097ce7622c 100644
--- a/manual/examples/argp-ex2.c
+++ b/manual/examples/argp-ex2.c
@@ -38,7 +38,8 @@ static char doc[] =
    option will print out @code{argp_program_version}.  */
 static struct argp argp = { 0, 0, 0, doc };
 
-int main (int argc, char **argv)
+int
+main (int argc, char **argv)
 {
   argp_parse (&argp, argc, argv, 0, 0, 0);
   exit (0);
diff --git a/manual/examples/argp-ex3.c b/manual/examples/argp-ex3.c
index a8a48ea685..d5896ee139 100644
--- a/manual/examples/argp-ex3.c
+++ b/manual/examples/argp-ex3.c
@@ -129,7 +129,8 @@ parse_opt (int key, char *arg, struct argp_state *state)
 /* Our argp parser.  */
 static struct argp argp = { options, parse_opt, args_doc, doc };
 
-int main (int argc, char **argv)
+int
+main (int argc, char **argv)
 {
   struct arguments arguments;
 
diff --git a/manual/examples/argp-ex4.c b/manual/examples/argp-ex4.c
index 8628a235dd..2b61358c7e 100644
--- a/manual/examples/argp-ex4.c
+++ b/manual/examples/argp-ex4.c
@@ -131,7 +131,8 @@ parse_opt (int key, char *arg, struct argp_state *state)
 /* Our argp parser.  */
 static struct argp argp = { options, parse_opt, args_doc, doc };
 
-int main (int argc, char **argv)
+int
+main (int argc, char **argv)
 {
   int i, j;
   struct arguments arguments;
diff --git a/manual/examples/longopt.c b/manual/examples/longopt.c
index 1661327f53..989e88713e 100644
--- a/manual/examples/longopt.c
+++ b/manual/examples/longopt.c
@@ -6,9 +6,7 @@
 static int verbose_flag;
 
 int
-main (argc, argv)
-     int argc;
-     char **argv;
+main (int argc, char **argv)
 {
   int c;
 
diff --git a/manual/examples/strncat.c b/manual/examples/strncat.c
index f865167f4a..948d662a4e 100644
--- a/manual/examples/strncat.c
+++ b/manual/examples/strncat.c
@@ -5,7 +5,8 @@
 
 static char buffer[SIZE];
 
-main ()
+int
+main (void)
 {
   strncpy (buffer, "hello", SIZE);
   puts (buffer);
diff --git a/manual/examples/subopt.c b/manual/examples/subopt.c
index 287fe8c495..a87bee1669 100644
--- a/manual/examples/subopt.c
+++ b/manual/examples/subopt.c
@@ -27,7 +27,7 @@ const char *mount_opts[] =
 };
 
 int
-main (int argc, char *argv[])
+main (int argc, char **argv)
 {
   char *subopts, *value;
   int opt;