Build fixes for argp.h with older gcc.

diff --git a/ChangeLog b/ChangeLog
index aca605e323158f14e39fed38c8269543ea9fbfd9..c3aa95e35ee0623f785d29288fa00fe10e4436fa 100644 (file)
--- 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 4aca01550b0c1f18f1d904e8391341f0b2339bf0..16688587037f67bc39f5e04f1bd6d4112dce7792 100644 (file)
--- 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 be05eec3ed7140c2f25f18bb865d87514a833cc2..68f53168b58c23eae623c4ed38c6f06a243e20b4 100644 (file)
--- 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 f64a66711ace2195b2a8738ce8ee725160eb6c40..118e89fe57fe9ba76b67cfe63d52e94950244777 100644 (file)
--- 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 7b72901333dc0024dd9fcf77a881f9345f7ce903..9989dfe7b6b9ddc1a9933b5fc042fc891fdce480 100644 (file)
--- 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 4ff723c5119cee7763cc401112736f9d012602bd..31af2a7ad9c0be245614599cee608c8ab87c0584 100644 (file)
--- 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 f48d34854858e579c08140d46b9ebc378d0e9b00..07fa43030fa0d33037a7292ac031a5284e4b1e6e 100644 (file)
--- 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 9fcef57789b2bd3d1ffc0bda4a48308cb9c1686c..8cfe0eaa2ef736401247278529d7123a9ff3f821 100644 (file)
--- 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 9869d0bbdbdbe8ad4babe8640b4816bbaf78ed4b..742353a421402a6a42db5938b8ce1040a1287b48 100644 (file)
--- 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 e654c3e5c8f5d9954b7f1b3113a33072c7741bfe..a2bd4c196e5e2a3f1f8cb0cc747253fcbb69182b 100644 (file)
--- 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 b90546e12a90088a7e6e7a0e7ef22b8ae34ca91d..692f881900bd77142d60df6bc3ef67d04e4bec8c 100644 (file)
--- 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 9db996474e7b8f0e0085bb909ebc93e4c2932732..8366a1121a1296d3699a935be300902303fa0d82 100644 (file)
--- 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 5f30c587eaeced65a3e2e7479fe7b163c65c7a33..5805f3c1034c9f544058911689cd268306b8b4dc 100644 (file)
--- 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 6e64accd03e12c12672597c0e9c5e05873279595..47a241a391b28644c05fed552d2571dbdb6e5eb7 100644 (file)
--- 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 576ab400db80540e2a08c5a52ed54829568f2662..8e2a2b8c27a0fd84cc438c790a49f653369c7165 100644 (file)
--- 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 ecb1d63320070492a75800a38d2306e6d69a4869..5a744a5ce5dc408baafdbff37e4072dc207e43a2 100644 (file)
--- 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 5c087ab3dbfb2e62d17bae1f95f51a189188a94a..ec0923b2ee6aaa6474e40ed060abe3ae1588c722 100644 (file)
--- 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 2111efa5a2b1ae11fe0fe908b45aee1bf9bbca61..801b3df4aca4ed77eb808098d053af71415d5327 100644 (file)
--- 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 1463abf6f9f25776480234ad299ad124e0feabd1..993b0206801af6aab5344af34dccfa4458d9fb62 100644 (file)
--- 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 4b9b319cfb23ef8ba96f600f840685530aa8f769..5e944c20a83a66e50d6510ad4d505da6a608c949 100644 (file)
--- 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 507cd85571773aa332712881b0e4d7e6eed81ac9..39663a8a714f943d406b1f88aa705be44dd6dfb2 100644 (file)
--- 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>