summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2009-08-21 19:44:36 +0200
committerJim Meyering <meyering@redhat.com>2009-08-24 18:15:13 +0200
commit881770900938595565036b9b191cfdf39ff0dc98 (patch)
tree33773c2135530588a73409795a825c3e01aa2707
parentb9a691af0fa468873eda3706a1c797568857785b (diff)
downloadlibguestfs-881770900938595565036b9b191cfdf39ff0dc98.tar.gz
libguestfs-881770900938595565036b9b191cfdf39ff0dc98.tar.xz
libguestfs-881770900938595565036b9b191cfdf39ff0dc98.zip
build: don't define _GNU_SOURCE manually
Now that we're using gnulib in earnest, any manual definition would provoke a redefinition warning. * fish/fish.c (_GNU_SOURCE): Don't define. * fish/destpaths.c (_GNU_SOURCE): Likewise. * src/guestfs.c (_GNU_SOURCE): Likewise. * bootstrap (modules): Add asprintf, strchrnul, strerror, strndup and vasprintf. * fish/fish.c (main): Set argv[0] to sanitized program_name, so functions like getopt_long that use argv[0] use the clean name.
-rwxr-xr-xbootstrap7
-rw-r--r--fish/destpaths.c2
-rw-r--r--fish/fish.c2
-rw-r--r--src/guestfs.c1
4 files changed, 6 insertions, 6 deletions
diff --git a/bootstrap b/bootstrap
index f5f8aafc..2eba6a71 100755
--- a/bootstrap
+++ b/bootstrap
@@ -50,6 +50,7 @@ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
(cd daemon && mkdir -p tests lib && ../$gnulib_tool --update)
modules='
+asprintf
closeout
gitlog-to-changelog
gnu-make
@@ -58,8 +59,12 @@ ignore-value
maintainer-makefile
manywarnings
progname
-warnings
+strchrnul
+strerror
+strndup
+vasprintf
vc-list-files
+warnings
'
$gnulib_tool \
diff --git a/fish/destpaths.c b/fish/destpaths.c
index 275db49a..1e42ae80 100644
--- a/fish/destpaths.c
+++ b/fish/destpaths.c
@@ -18,8 +18,6 @@
#include <config.h>
-#define _GNU_SOURCE // for strndup, asprintf
-
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
diff --git a/fish/fish.c b/fish/fish.c
index a7588106..a4069d6d 100644
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -18,8 +18,6 @@
#include <config.h>
-#define _GNU_SOURCE // for strchrnul
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/guestfs.c b/src/guestfs.c
index 204125b9..145f0f39 100644
--- a/src/guestfs.c
+++ b/src/guestfs.c
@@ -19,7 +19,6 @@
#include <config.h>
#define _BSD_SOURCE /* for mkdtemp, usleep */
-#define _GNU_SOURCE /* for vasprintf, GNU strerror_r, strchrnul */
#include <stdio.h>
#include <stdlib.h>