summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2012-09-17 09:51:01 +0100
committerRichard W.M. Jones <rjones@redhat.com>2012-09-19 14:09:29 +0100
commitd1cb6f30523d59a69bc5997b1adc47b648af2de2 (patch)
treee7b8fb7370862c7ae00efa937dd11c04531fecb9
parentd918561f712f4dab9e54bd314308b82b1beb072c (diff)
downloadlibguestfs-d1cb6f30523d59a69bc5997b1adc47b648af2de2.tar.gz
libguestfs-d1cb6f30523d59a69bc5997b1adc47b648af2de2.tar.xz
libguestfs-d1cb6f30523d59a69bc5997b1adc47b648af2de2.zip
syntax: Remove definitions of O_CLOEXEC, except in examples (thanks Jim Meyering).
The gnulib <fcntl.h> replacement header will now define this symbol if it's not defined already. (cherry picked from commit cb13ffe190ac41a9b77fe27521838f495c1a5077)
-rw-r--r--cfg.mk1
-rw-r--r--daemon/guestfsd.c5
2 files changed, 1 insertions, 5 deletions
diff --git a/cfg.mk b/cfg.mk
index b134842e..d06cefe1 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -27,6 +27,7 @@ url_dir_list = \
# Exclude some filenames.
exclude_file_name_regexp--sc_bindtextdomain = ^(daemon|erlang|examples|tests)/
exclude_file_name_regexp--sc_error_message_period = ^php/
+exclude_file_name_regexp--sc_prohibit_always-defined_macros = ^examples/
# Tests not to run as part of "make distcheck".
local-checks-to-skip = \
diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c
index f888cdc6..8adffd66 100644
--- a/daemon/guestfsd.c
+++ b/daemon/guestfsd.c
@@ -59,11 +59,6 @@ static char *read_cmdline (void);
# define MAX(a,b) ((a)>(b)?(a):(b))
#endif
-/* Not the end of the world if this open flag is not defined. */
-#ifndef O_CLOEXEC
-# define O_CLOEXEC 0
-#endif
-
/* If root device is an ext2 filesystem, this is the major and minor.
* This is so we can ignore this device from the point of view of the
* user, eg. in guestfs_list_devices and many other places.