code cleanup: header detection with has_include

This commit is contained in:
Yury Popov
2022-11-27 14:54:48 +03:00
parent 6a8b6ae723
commit c8a21a5463
6 changed files with 6 additions and 7 deletions
+2 -2
View File
@@ -20,10 +20,10 @@
#define ENDIAN_H_COMPAT_SHIM
#pragma once
#if defined(HAVE_ENDIAN_H)
#if __has_include_next(<endian.h>)
# pragma GCC system_header // Silence "warning: #include_next is a GCC extension"
# include_next <endian.h>
#elif defined(HAVE_SYS_ENDIAN_H)
#elif __has_include(<sys/endian.h>)
# include <sys/endian.h>
# if !defined(be16toh)
# define be16toh(x) betoh16(x)
+1 -1
View File
@@ -21,7 +21,7 @@
#ifndef GETOPT_H_COMPAT_SHIM
#define GETOPT_H_COMPAT_SHIM
#if defined(HAVE_GETOPT_H)
#if __has_include_next(<getopt.h>)
#pragma GCC system_header // Silence "warning: #include_next is a GCC extension"
#include_next <getopt.h>
#else
+1 -1
View File
@@ -45,7 +45,7 @@
#pragma GCC system_header // Silence "warning: #include_next is a GCC extension"
#if defined(HAVE_STDINT_H) || !defined(HAVE_INTTYPES_H)
#if __has_include(<stdint.h>) || !__has_include(<inttypes.h>)
#include_next <stdint.h>
#else
#include_next <inttypes.h>
+1 -1
View File
@@ -19,7 +19,7 @@
#ifndef UNISTD_H_COMPAT_SHIM
#define UNISTD_H_COMPAT_SHIM
#if defined(HAVE_UNISTD_H)
#if __has_include_next(<unistd.h>)
#pragma GCC system_header // Silence "warning: #include_next is a GCC extension"
#include_next <unistd.h>
#endif
-1
View File
@@ -38,7 +38,6 @@
#include "readclause.h"
#include "common.h" // for GetFileLength, strncpy0
#include "config.h" // for HAVE_MKSTEMP
#include "dictionary.h" // for LookupDictList, DecodePhonemes, Set...
#include "error.h" // for create_file_error_context
#include "phoneme.h" // for phonSWITCH
+1 -1
View File
@@ -31,7 +31,7 @@
#endif
#ifndef MAKE_MEM_UNDEFINED
# ifdef HAVE_VALGRIND_MEMCHECK_H
# if __has_include(<valgrind/memcheck.h>)
# include <valgrind/memcheck.h>
# define MAKE_MEM_UNDEFINED(addr, len) VALGRIND_MAKE_MEM_UNDEFINED(addr, len)
# else