From ca3e20886e3901e7c938c07c994e6e724d208fc0 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sat, 21 Dec 2013 18:08:25 +0100
Subject: [PATCH] 	Build fixes for argp.h with older gcc.

---
 ChangeLog                        | 4 ++++
 grub-core/kern/emu/argp_common.c | 1 +
 util/glue-efi.c                  | 1 -
 util/grub-editenv.c              | 5 +++++
 util/grub-file.c                 | 1 -
 util/grub-fstest.c               | 4 ++++
 util/grub-glue-efi.c             | 7 ++++++-
 util/grub-install.c              | 6 +++++-
 util/grub-macbless.c             | 4 ++++
 util/grub-mkimage.c              | 6 ++++++
 util/grub-mklayout.c             | 9 ++++++++-
 util/grub-mknetdir.c             | 7 ++++++-
 util/grub-mkpasswd-pbkdf2.c      | 5 +++++
 util/grub-mkrelpath.c            | 4 ++++
 util/grub-mkstandalone.c         | 7 ++++++-
 util/grub-probe.c                | 5 +++++
 util/grub-render-label.c         | 7 ++++++-
 util/grub-script-check.c         | 4 ++++
 util/grub-setup.c                | 4 ++++
 util/grub-syslinux2cfg.c         | 7 ++++++-
 util/render-label.c              | 1 -
 21 files changed, 89 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aca605e32..c3aa95e35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Build fixes for argp.h with older gcc.
+
 2013-12-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-glue-efi.c: Use "universal binary" rather "fat binary"
diff --git a/grub-core/kern/emu/argp_common.c b/grub-core/kern/emu/argp_common.c
index 4aca01550..166885870 100644
--- a/grub-core/kern/emu/argp_common.c
+++ b/grub-core/kern/emu/argp_common.c
@@ -21,6 +21,7 @@
 #include <config-util.h>
 
 #pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
 
 #define _GNU_SOURCE	1
 #include <stdlib.h>
diff --git a/util/glue-efi.c b/util/glue-efi.c
index be05eec3e..68f53168b 100644
--- a/util/glue-efi.c
+++ b/util/glue-efi.c
@@ -29,7 +29,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <argp.h>
 #include <unistd.h>
 #include <errno.h>
 
diff --git a/util/grub-editenv.c b/util/grub-editenv.c
index f64a66711..118e89fe5 100644
--- a/util/grub-editenv.c
+++ b/util/grub-editenv.c
@@ -30,7 +30,12 @@
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
 #include <argp.h>
+#pragma GCC diagnostic error "-Wmissing-prototypes"
+#pragma GCC diagnostic error "-Wmissing-declarations"
+
 
 #include "progname.h"
 
diff --git a/util/grub-file.c b/util/grub-file.c
index 7b7290133..9989dfe7b 100644
--- a/util/grub-file.c
+++ b/util/grub-file.c
@@ -34,7 +34,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <argp.h>
 #include <unistd.h>
 #include <errno.h>
 
diff --git a/util/grub-fstest.c b/util/grub-fstest.c
index 4ff723c51..31af2a7ad 100644
--- a/util/grub-fstest.c
+++ b/util/grub-fstest.c
@@ -41,7 +41,11 @@
 #include <string.h>
 
 #include "progname.h"
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
 #include "argp.h"
+#pragma GCC diagnostic error "-Wmissing-prototypes"
+#pragma GCC diagnostic error "-Wmissing-declarations"
 
 static grub_err_t
 execute_command (const char *name, int n, char **args)
diff --git a/util/grub-glue-efi.c b/util/grub-glue-efi.c
index f48d34854..07fa43030 100644
--- a/util/grub-glue-efi.c
+++ b/util/grub-glue-efi.c
@@ -29,10 +29,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <argp.h>
 #include <unistd.h>
 #include <errno.h>
 
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
+#include <argp.h>
+#pragma GCC diagnostic error "-Wmissing-prototypes"
+#pragma GCC diagnostic error "-Wmissing-declarations"
+
 #include "progname.h"
 
 struct arguments
diff --git a/util/grub-install.c b/util/grub-install.c
index 9fcef5778..8cfe0eaa2 100644
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -45,7 +45,11 @@
 
 #include <string.h>
 
-#include "argp.h"
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
+#include <argp.h>
+#pragma GCC diagnostic error "-Wmissing-prototypes"
+#pragma GCC diagnostic error "-Wmissing-declarations"
 
 #include "progname.h"
 
diff --git a/util/grub-macbless.c b/util/grub-macbless.c
index 9869d0bbd..742353a42 100644
--- a/util/grub-macbless.c
+++ b/util/grub-macbless.c
@@ -45,7 +45,11 @@
 #include <sys/stat.h>
 
 #define _GNU_SOURCE	1
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
 #include <argp.h>
+#pragma GCC diagnostic error "-Wmissing-prototypes"
+#pragma GCC diagnostic error "-Wmissing-declarations"
 
 #include "progname.h"
 
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index e654c3e5c..a2bd4c196 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -48,7 +48,13 @@
 #include <grub/emu/config.h>
 
 #define _GNU_SOURCE	1
+
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
 #include <argp.h>
+#pragma GCC diagnostic error "-Wmissing-prototypes"
+#pragma GCC diagnostic error "-Wmissing-declarations"
+
 
 #include "progname.h"
 
diff --git a/util/grub-mklayout.c b/util/grub-mklayout.c
index b90546e12..692f88190 100644
--- a/util/grub-mklayout.c
+++ b/util/grub-mklayout.c
@@ -28,10 +28,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <argp.h>
+
 #include <unistd.h>
 #include <errno.h>
 
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
+
+#include <argp.h>
+#pragma GCC diagnostic error "-Wmissing-prototypes"
+#pragma GCC diagnostic error "-Wmissing-declarations"
+
 #include "progname.h"
 
 struct arguments
diff --git a/util/grub-mknetdir.c b/util/grub-mknetdir.c
index 9db996474..8366a1121 100644
--- a/util/grub-mknetdir.c
+++ b/util/grub-mknetdir.c
@@ -21,10 +21,15 @@
 #include <grub/emu/config.h>
 #include <grub/util/misc.h>
 
-#include <argp.h>
 #include <string.h>
 #include <errno.h>
 
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
+#include <argp.h>
+#pragma GCC diagnostic error "-Wmissing-prototypes"
+#pragma GCC diagnostic error "-Wmissing-declarations"
+
 static char *rootdir = NULL, *subdir = NULL;
 static char *debug_image = NULL;
 
diff --git a/util/grub-mkpasswd-pbkdf2.c b/util/grub-mkpasswd-pbkdf2.c
index 5f30c587e..5805f3c10 100644
--- a/util/grub-mkpasswd-pbkdf2.c
+++ b/util/grub-mkpasswd-pbkdf2.c
@@ -33,7 +33,12 @@
 
 #define _GNU_SOURCE	1
 
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
 #include <argp.h>
+#pragma GCC diagnostic error "-Wmissing-prototypes"
+#pragma GCC diagnostic error "-Wmissing-declarations"
+
 
 #include "progname.h"
 
diff --git a/util/grub-mkrelpath.c b/util/grub-mkrelpath.c
index 6e64accd0..47a241a39 100644
--- a/util/grub-mkrelpath.c
+++ b/util/grub-mkrelpath.c
@@ -26,7 +26,11 @@
 #include <grub/i18n.h>
 
 #define _GNU_SOURCE	1
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
 #include <argp.h>
+#pragma GCC diagnostic error "-Wmissing-prototypes"
+#pragma GCC diagnostic error "-Wmissing-declarations"
 
 #include "progname.h"
 
diff --git a/util/grub-mkstandalone.c b/util/grub-mkstandalone.c
index 576ab400d..8e2a2b8c2 100644
--- a/util/grub-mkstandalone.c
+++ b/util/grub-mkstandalone.c
@@ -22,9 +22,14 @@
 #include <grub/util/misc.h>
 #include <grub/emu/config.h>
 
-#include <argp.h>
 #include <string.h>
 
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
+#include <argp.h>
+#pragma GCC diagnostic error "-Wmissing-prototypes"
+#pragma GCC diagnostic error "-Wmissing-declarations"
+
 static char *output_image;
 static char **files;
 static int nfiles;
diff --git a/util/grub-probe.c b/util/grub-probe.c
index ecb1d6332..5a744a5ce 100644
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -46,7 +46,12 @@
 #include <assert.h>
 
 #define _GNU_SOURCE	1
+
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
 #include <argp.h>
+#pragma GCC diagnostic error "-Wmissing-prototypes"
+#pragma GCC diagnostic error "-Wmissing-declarations"
 
 #include "progname.h"
 
diff --git a/util/grub-render-label.c b/util/grub-render-label.c
index 5c087ab3d..ec0923b2e 100644
--- a/util/grub-render-label.c
+++ b/util/grub-render-label.c
@@ -33,10 +33,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <argp.h>
 #include <unistd.h>
 #include <errno.h>
 
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
+#include <argp.h>
+#pragma GCC diagnostic error "-Wmissing-prototypes"
+#pragma GCC diagnostic error "-Wmissing-declarations"
+
 #include "progname.h"
 
 struct arguments
diff --git a/util/grub-script-check.c b/util/grub-script-check.c
index 2111efa5a..801b3df4a 100644
--- a/util/grub-script-check.c
+++ b/util/grub-script-check.c
@@ -34,7 +34,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
 #include <argp.h>
+#pragma GCC diagnostic error "-Wmissing-prototypes"
+#pragma GCC diagnostic error "-Wmissing-declarations"
 
 #include "progname.h"
 
diff --git a/util/grub-setup.c b/util/grub-setup.c
index 1463abf6f..993b02068 100644
--- a/util/grub-setup.c
+++ b/util/grub-setup.c
@@ -39,7 +39,11 @@
 #include <grub/emu/getroot.h>
 #include <grub/util/install.h>
 
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
 #include <argp.h>
+#pragma GCC diagnostic error "-Wmissing-prototypes"
+#pragma GCC diagnostic error "-Wmissing-declarations"
 
 /* On SPARC this program fills in various fields inside of the 'boot' and 'core'
  * image files.
diff --git a/util/grub-syslinux2cfg.c b/util/grub-syslinux2cfg.c
index 4b9b319cf..5e944c20a 100644
--- a/util/grub-syslinux2cfg.c
+++ b/util/grub-syslinux2cfg.c
@@ -30,7 +30,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <argp.h>
 #include <unistd.h>
 #include <errno.h>
 #include <grub/err.h>
@@ -40,6 +39,12 @@
 #include <grub/mm.h>
 #include <grub/syslinux_parse.h>
 
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
+#include <argp.h>
+#pragma GCC diagnostic error "-Wmissing-prototypes"
+#pragma GCC diagnostic error "-Wmissing-declarations"
+
 #include "progname.h"
 
 struct arguments
diff --git a/util/render-label.c b/util/render-label.c
index 507cd8557..39663a8a7 100644
--- a/util/render-label.c
+++ b/util/render-label.c
@@ -33,7 +33,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <argp.h>
 #include <unistd.h>
 #include <errno.h>