From d1cb6f30523d59a69bc5997b1adc47b648af2de2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 17 Sep 2012 09:51:01 +0100 Subject: syntax: Remove definitions of O_CLOEXEC, except in examples (thanks Jim Meyering). The gnulib replacement header will now define this symbol if it's not defined already. (cherry picked from commit cb13ffe190ac41a9b77fe27521838f495c1a5077) --- cfg.mk | 1 + daemon/guestfsd.c | 5 ----- 2 files changed, 1 insertion(+), 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. -- cgit