diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2018-06-28 04:19:22 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2018-06-28 04:19:22 +0200 |
commit | c4f76880e9589a757a194c19a4526599dfe71f50 (patch) | |
tree | c66def0aa296e781c51dfc51c8bba9d8ac51189b /lib/sys_types.in.h | |
parent | 76ef1d8e3249e82a6965fd17157bee00a7857ff3 (diff) | |
parent | 7b65dbd4ebade81d504cfe5e681292a58ad1fdf0 (diff) |
Update upstream source from tag 'upstream/0.9.10'
Update to upstream version '0.9.10'
with Debian dir 9736048cfd7ea97640dba10ba42a3839100c5694
Diffstat (limited to 'lib/sys_types.in.h')
-rw-r--r-- | lib/sys_types.in.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/sys_types.in.h b/lib/sys_types.in.h index 739ff52c..4530f3e3 100644 --- a/lib/sys_types.in.h +++ b/lib/sys_types.in.h @@ -29,6 +29,17 @@ #endif @PRAGMA_COLUMNS@ +#if defined _WIN32 && !defined __CYGWIN__ \ + && (defined __need_off_t || defined __need___off64_t \ + || defined __need_ssize_t || defined __need_time_t) + +/* Special invocation convention inside mingw header files. */ + +#@INCLUDE_NEXT@ @NEXT_SYS_TYPES_H@ + +#else +/* Normal invocation convention. */ + #ifndef _@GUARD_PREFIX@_SYS_TYPES_H /* The include_next requires a split double-inclusion guard. */ @@ -95,10 +106,10 @@ typedef unsigned long long int rpl_ino_t; /* MSVC 9 defines size_t in <stddef.h>, not in <sys/types.h>. */ /* But avoid namespace pollution on glibc systems. */ -#if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \ - && ! defined __GLIBC__ +#if (defined _WIN32 && ! defined __CYGWIN__) && ! defined __GLIBC__ # include <stddef.h> #endif #endif /* _@GUARD_PREFIX@_SYS_TYPES_H */ #endif /* _@GUARD_PREFIX@_SYS_TYPES_H */ +#endif /* __need_XXX */ |