generic-library/libbsd
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libbsd/libbsd.git synced 2025-01-09 19:27:42 +01:00
Code Issues Projects Releases Wiki Activity

Guard non-portable forwarded includes

Browse Source 
These headers are not available on Windows. <bsd/sys/cdefs.h> ensures
that __has_include() and __has_include_next() are defined.

Signed-off-by: Guillem Jover <guillem@hadrons.org>
This commit is contained in:
Aaron Dierking 2018-06-14 11:38:32 -07:00 committed by Guillem Jover
parent 2ebe6d5a02
commit c2d9d84088
5 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/bsd/err.h
View File

@ -26,20 +26,20 @@
*/ */
#ifdef LIBBSD_OVERLAY #ifdef LIBBSD_OVERLAY
#include <sys/cdefs.h>
#if __has_include_next(<err.h>)
#include_next <err.h> #include_next <err.h>
#endif
#else #else
#include <bsd/sys/cdefs.h>
#if __has_include(<err.h>)
#include <err.h> #include <err.h>
#endif #endif
#endif
#ifndef LIBBSD_ERR_H #ifndef LIBBSD_ERR_H
#define LIBBSD_ERR_H #define LIBBSD_ERR_H
#ifdef LIBBSD_OVERLAY
#include <sys/cdefs.h>
#else
#include <bsd/sys/cdefs.h>
#endif
#include <stdarg.h> #include <stdarg.h>
__BEGIN_DECLS __BEGIN_DECLS

6
include/bsd/getopt.h
View File

@ -25,9 +25,15 @@
*/ */
#ifdef LIBBSD_OVERLAY #ifdef LIBBSD_OVERLAY
#include <sys/cdefs.h>
#if __has_include_next(<getopt.h>)
#include_next <getopt.h> #include_next <getopt.h>
#endif
#include <unistd.h> #include <unistd.h>
#else #else
#include <bsd/sys/cdefs.h>
#if __has_include(<getopt.h>)
#include <getopt.h> #include <getopt.h>
#endif
#include <bsd/unistd.h> #include <bsd/unistd.h>
#endif #endif

6
include/bsd/sys/endian.h
View File

@ -27,10 +27,16 @@
*/ */
#ifdef LIBBSD_OVERLAY #ifdef LIBBSD_OVERLAY
#include <sys/cdefs.h>
#if __has_include_next(<endian.h>)
#include_next <endian.h> #include_next <endian.h>
#endif
#else #else
#include <bsd/sys/cdefs.h>
#if __has_include(<endian.h>)
#include <endian.h> #include <endian.h>
#endif #endif
#endif
#ifndef LIBBSD_SYS_ENDIAN_H #ifndef LIBBSD_SYS_ENDIAN_H
#define LIBBSD_SYS_ENDIAN_H #define LIBBSD_SYS_ENDIAN_H

6
include/bsd/sys/time.h
View File

@ -33,10 +33,16 @@
*/ */
#ifdef LIBBSD_OVERLAY #ifdef LIBBSD_OVERLAY
#include <sys/cdefs.h>
#if __has_include_next(<sys/time.h>)
#include_next <sys/time.h> #include_next <sys/time.h>
#endif
#else #else
#include <bsd/sys/cdefs.h>
#if __has_include(<sys/time.h>)
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#endif
#ifndef LIBBSD_SYS_TIME_H #ifndef LIBBSD_SYS_TIME_H
#define LIBBSD_SYS_TIME_H #define LIBBSD_SYS_TIME_H

11
include/bsd/unistd.h
View File

@ -26,19 +26,20 @@
*/ */
#ifdef LIBBSD_OVERLAY #ifdef LIBBSD_OVERLAY
#include <sys/cdefs.h>
#if __has_include_next(<unistd.h>)
#include_next <unistd.h> #include_next <unistd.h>
#endif
#else #else
#include <bsd/sys/cdefs.h>
#if __has_include(<unistd.h>)
#include <unistd.h> #include <unistd.h>
#endif #endif
#endif
#ifndef LIBBSD_UNISTD_H #ifndef LIBBSD_UNISTD_H
#define LIBBSD_UNISTD_H #define LIBBSD_UNISTD_H
#ifdef LIBBSD_OVERLAY
#include <sys/cdefs.h>
#else
#include <bsd/sys/cdefs.h>
#endif
#include <sys/stat.h> #include <sys/stat.h>
#if !defined(S_ISTXT) && defined(S_ISVTX) #if !defined(S_ISTXT) && defined(S_ISVTX)