Build fixes for argp.h with older gcc.
This commit is contained in:
parent
27db1a9b64
commit
ca3e20886e
21 changed files with 89 additions and 10 deletions
|
@ -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>
|
2013-12-21 Vladimir Serbinenko <phcoder@gmail.com>
|
||||||
|
|
||||||
* util/grub-glue-efi.c: Use "universal binary" rather "fat binary"
|
* util/grub-glue-efi.c: Use "universal binary" rather "fat binary"
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include <config-util.h>
|
#include <config-util.h>
|
||||||
|
|
||||||
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
|
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
|
||||||
|
#pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
|
||||||
#define _GNU_SOURCE 1
|
#define _GNU_SOURCE 1
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
|
@ -29,7 +29,6 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <argp.h>
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,12 @@
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
|
||||||
|
#pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
#include <argp.h>
|
#include <argp.h>
|
||||||
|
#pragma GCC diagnostic error "-Wmissing-prototypes"
|
||||||
|
#pragma GCC diagnostic error "-Wmissing-declarations"
|
||||||
|
|
||||||
|
|
||||||
#include "progname.h"
|
#include "progname.h"
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,6 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <argp.h>
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,11 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "progname.h"
|
#include "progname.h"
|
||||||
|
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
|
||||||
|
#pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
#include "argp.h"
|
#include "argp.h"
|
||||||
|
#pragma GCC diagnostic error "-Wmissing-prototypes"
|
||||||
|
#pragma GCC diagnostic error "-Wmissing-declarations"
|
||||||
|
|
||||||
static grub_err_t
|
static grub_err_t
|
||||||
execute_command (const char *name, int n, char **args)
|
execute_command (const char *name, int n, char **args)
|
||||||
|
|
|
@ -29,10 +29,15 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <argp.h>
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <errno.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"
|
#include "progname.h"
|
||||||
|
|
||||||
struct arguments
|
struct arguments
|
||||||
|
|
|
@ -45,7 +45,11 @@
|
||||||
|
|
||||||
#include <string.h>
|
#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"
|
#include "progname.h"
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,11 @@
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
#define _GNU_SOURCE 1
|
#define _GNU_SOURCE 1
|
||||||
|
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
|
||||||
|
#pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
#include <argp.h>
|
#include <argp.h>
|
||||||
|
#pragma GCC diagnostic error "-Wmissing-prototypes"
|
||||||
|
#pragma GCC diagnostic error "-Wmissing-declarations"
|
||||||
|
|
||||||
#include "progname.h"
|
#include "progname.h"
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,13 @@
|
||||||
#include <grub/emu/config.h>
|
#include <grub/emu/config.h>
|
||||||
|
|
||||||
#define _GNU_SOURCE 1
|
#define _GNU_SOURCE 1
|
||||||
|
|
||||||
|
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
|
||||||
|
#pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
#include <argp.h>
|
#include <argp.h>
|
||||||
|
#pragma GCC diagnostic error "-Wmissing-prototypes"
|
||||||
|
#pragma GCC diagnostic error "-Wmissing-declarations"
|
||||||
|
|
||||||
|
|
||||||
#include "progname.h"
|
#include "progname.h"
|
||||||
|
|
||||||
|
|
|
@ -28,10 +28,17 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <argp.h>
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <errno.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"
|
#include "progname.h"
|
||||||
|
|
||||||
struct arguments
|
struct arguments
|
||||||
|
|
|
@ -21,10 +21,15 @@
|
||||||
#include <grub/emu/config.h>
|
#include <grub/emu/config.h>
|
||||||
#include <grub/util/misc.h>
|
#include <grub/util/misc.h>
|
||||||
|
|
||||||
#include <argp.h>
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <errno.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 *rootdir = NULL, *subdir = NULL;
|
||||||
static char *debug_image = NULL;
|
static char *debug_image = NULL;
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,12 @@
|
||||||
|
|
||||||
#define _GNU_SOURCE 1
|
#define _GNU_SOURCE 1
|
||||||
|
|
||||||
|
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
|
||||||
|
#pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
#include <argp.h>
|
#include <argp.h>
|
||||||
|
#pragma GCC diagnostic error "-Wmissing-prototypes"
|
||||||
|
#pragma GCC diagnostic error "-Wmissing-declarations"
|
||||||
|
|
||||||
|
|
||||||
#include "progname.h"
|
#include "progname.h"
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,11 @@
|
||||||
#include <grub/i18n.h>
|
#include <grub/i18n.h>
|
||||||
|
|
||||||
#define _GNU_SOURCE 1
|
#define _GNU_SOURCE 1
|
||||||
|
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
|
||||||
|
#pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
#include <argp.h>
|
#include <argp.h>
|
||||||
|
#pragma GCC diagnostic error "-Wmissing-prototypes"
|
||||||
|
#pragma GCC diagnostic error "-Wmissing-declarations"
|
||||||
|
|
||||||
#include "progname.h"
|
#include "progname.h"
|
||||||
|
|
||||||
|
|
|
@ -22,9 +22,14 @@
|
||||||
#include <grub/util/misc.h>
|
#include <grub/util/misc.h>
|
||||||
#include <grub/emu/config.h>
|
#include <grub/emu/config.h>
|
||||||
|
|
||||||
#include <argp.h>
|
|
||||||
#include <string.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 *output_image;
|
||||||
static char **files;
|
static char **files;
|
||||||
static int nfiles;
|
static int nfiles;
|
||||||
|
|
|
@ -46,7 +46,12 @@
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#define _GNU_SOURCE 1
|
#define _GNU_SOURCE 1
|
||||||
|
|
||||||
|
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
|
||||||
|
#pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
#include <argp.h>
|
#include <argp.h>
|
||||||
|
#pragma GCC diagnostic error "-Wmissing-prototypes"
|
||||||
|
#pragma GCC diagnostic error "-Wmissing-declarations"
|
||||||
|
|
||||||
#include "progname.h"
|
#include "progname.h"
|
||||||
|
|
||||||
|
|
|
@ -33,10 +33,15 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <argp.h>
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <errno.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"
|
#include "progname.h"
|
||||||
|
|
||||||
struct arguments
|
struct arguments
|
||||||
|
|
|
@ -34,7 +34,11 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
|
||||||
|
#pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
#include <argp.h>
|
#include <argp.h>
|
||||||
|
#pragma GCC diagnostic error "-Wmissing-prototypes"
|
||||||
|
#pragma GCC diagnostic error "-Wmissing-declarations"
|
||||||
|
|
||||||
#include "progname.h"
|
#include "progname.h"
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,11 @@
|
||||||
#include <grub/emu/getroot.h>
|
#include <grub/emu/getroot.h>
|
||||||
#include <grub/util/install.h>
|
#include <grub/util/install.h>
|
||||||
|
|
||||||
|
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
|
||||||
|
#pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
#include <argp.h>
|
#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'
|
/* On SPARC this program fills in various fields inside of the 'boot' and 'core'
|
||||||
* image files.
|
* image files.
|
||||||
|
|
|
@ -30,7 +30,6 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <argp.h>
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <grub/err.h>
|
#include <grub/err.h>
|
||||||
|
@ -40,6 +39,12 @@
|
||||||
#include <grub/mm.h>
|
#include <grub/mm.h>
|
||||||
#include <grub/syslinux_parse.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"
|
#include "progname.h"
|
||||||
|
|
||||||
struct arguments
|
struct arguments
|
||||||
|
|
|
@ -33,7 +33,6 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <argp.h>
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue