From 840207d8ee5249c11463baaf5fb37c44595c4f00 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 2 Dec 2013 11:09:24 +0000 Subject: [PATCH] gnulib's sys/stat.h always defines S_IRGRP, S_IXGRP, S_IXOTH. Confirmed that cross building a mingw gdb still works, and also made sure it was gnulib's sys/stat.h that was defining the values, by hacking the header with #errors where the macros are defined. gdb/ 2013-12-02 Pedro Alves * ctf.c (ctf_start): Use S_IRGRP, S_IXGRP, S_IXOTH unconditionally. --- gdb/ChangeLog | 5 +++++ gdb/ctf.c | 13 +------------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3d8ed206ffb..ca2ca0e0378 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2013-12-02 Pedro Alves + + * ctf.c (ctf_start): Use S_IRGRP, S_IXGRP, S_IXOTH + unconditionally. + 2013-12-02 Pedro Alves Maciej W. Rozycki diff --git a/gdb/ctf.c b/gdb/ctf.c index dcc4eb87411..b886d67fa18 100644 --- a/gdb/ctf.c +++ b/gdb/ctf.c @@ -313,18 +313,7 @@ ctf_start (struct trace_file_writer *self, const char *dirname) struct ctf_trace_file_writer *writer = (struct ctf_trace_file_writer *) self; int i; - mode_t hmode = S_IRUSR | S_IWUSR | S_IXUSR -#ifdef S_IRGRP - | S_IRGRP -#endif -#ifdef S_IXGRP - | S_IXGRP -#endif - | S_IROTH -#ifdef S_IXOTH - | S_IXOTH -#endif - ; + mode_t hmode = S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH; /* Create DIRNAME. */ if (mkdir (dirname, hmode) && errno != EEXIST) -- 2.30.2