hyung-hwan/moo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor changes in MOO_STATIC_ASSERT() definition.

Browse Source 
defined O_CLOEXEC to 0 when it's not defined
This commit is contained in:
hyunghwan.chung 2019-10-30 14:34:43 +00:00
parent 290b583f41
commit 762dcb3f66
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moo/lib/moo-cmn.h
View File

@ -1043,8 +1043,10 @@ typedef struct moo_t moo_t;
# define MOO_STATIC_ASSERT(expr) _Static_assert (expr, "invalid assertion") # define MOO_STATIC_ASSERT(expr) _Static_assert (expr, "invalid assertion")
#elif defined(__cplusplus) && (__cplusplus >= 201103L) #elif defined(__cplusplus) && (__cplusplus >= 201103L)
# define MOO_STATIC_ASSERT(expr) static_assert (expr, "invalid assertion") # define MOO_STATIC_ASSERT(expr) static_assert (expr, "invalid assertion")
#else #elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
# define MOO_STATIC_ASSERT(expr) typedef char MOO_STATIC_JOIN(MOO_STATIC_ASSERT_T_, __LINE__)[(expr)? 1: -1] MOO_UNUSED # define MOO_STATIC_ASSERT(expr) typedef char MOO_STATIC_JOIN(MOO_STATIC_ASSERT_T_, __LINE__)[(expr)? 1: -1] MOO_UNUSED
#else
# define MOO_STATIC_ASSERT(expr) do { typedef char MOO_STATIC_JOIN(MOO_STATIC_ASSERT_T_, __LINE__)[(expr)? 1: -1] MOO_UNUSED; } while(0)
#endif #endif
#define MOO_STATIC_ASSERT_EXPR(expr) ((void)MOO_SIZEOF(char[(expr)? 1: -1])) #define MOO_STATIC_ASSERT_EXPR(expr) ((void)MOO_SIZEOF(char[(expr)? 1: -1]))

9
moo/mod/io-file.c
View File

@ -34,6 +34,10 @@
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#if !defined(O_CLOEXEC)
# define O_CLOEXEC 0 /* since it's not defined, 0 results in no effect when bitwise-ORed. */
#endif
static moo_pfrc_t pf_open_file (moo_t* moo, moo_mod_t* mod, moo_ooi_t nargs) static moo_pfrc_t pf_open_file (moo_t* moo, moo_mod_t* mod, moo_ooi_t nargs)
{ {
oop_io_t io; oop_io_t io;
@ -93,10 +97,7 @@ static moo_pfrc_t pf_open_file (moo_t* moo, moo_mod_t* mod, moo_ooi_t nargs)
goto oops; goto oops;
} }
fl |= O_NONBLOCK; fl |= O_NONBLOCK | O_CLOEXEC;
#if defined(O_CLOEXEC)
fl |= O_CLOEXEC;
#endif
if (fcntl(fd, F_SETFL, fl) == -1) goto fcntl_failure; if (fcntl(fd, F_SETFL, fl) == -1) goto fcntl_failure;