i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a features.h to auto enable _DEFAULT_SOURCE

Browse Source 
Unless __STRICT_ANSI__ is defined (as it is when running the compiler in
--std=c89 or --std=c99, but not when running it without any specific
args), we can enable these by default and behave like most other
systems. I don't know why no one has done this yet despite suggesting it
multiple times and people prefer to #define _BSD_SOURCE manually
everywhere.

Remove all places in our Jamfiles and sources where it had been defined.
_DEFAULT_SOURCE is now enabled by default for all sources of Haiku, since we
let the compiler use GNU extensions (no strict C standard specified on
command line)

Use _DEFAULT_SOURCE as the define name to match current versions of
glibc. Enable it if _BSD_SOURCE is #defined in compiler flags, for
backward compatibility.

Change-Id: I6db04da5f6db437723cdfba3478f5094a69d7727
Reviewed-on: https://review.haiku-os.org/c/1633
Reviewed-by: Jérôme Duval <[email protected]>
This commit is contained in:
Adrien Destugues
2019-07-29 20:26:46 +00:00
committed by Adrien Destugues
parent 70e55f0046
commit 4950607607
52 changed files with 92 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/bin/install-wifi-firmwares.sh
+1 -1
View File
@@ -276,7 +276,7 @@ function BuildBroadcomFWCutter()
# Build b43-fwcutter.
echo "Compiling b43-fwcutter for installing Broadcom's firmware ..."
make PREFIX=/boot/system CFLAGS="-I. -Wall -D_BSD_SOURCE" >/dev/null 2>&1
make PREFIX=/boot/system CFLAGS="-I. -Wall" >/dev/null 2>&1
result=$?
if [ $result -gt 0 ]; then
echo "... failed to compile b43-fwcutter."
headers/compatibility/bsd/arpa/ftp.h
+4 -1
View File
@@ -37,7 +37,10 @@
#define _ARPA_FTP_H_
#ifdef _BSD_SOURCE
#include <features.h>
#ifdef _DEFAULT_SOURCE
/* Definitions for FTP; see RFC-765. */
headers/compatibility/bsd/arpa/telnet.h
+4 -1
View File
@@ -38,7 +38,10 @@
#define _ARPA_TELNET_H_
#ifdef _BSD_SOURCE
#include <features.h>
#ifdef _DEFAULT_SOURCE
/*
headers/compatibility/bsd/arpa/tftp.h
+4 -1
View File
@@ -38,7 +38,10 @@
#define _ARPA_TFTP_H_
#ifdef _BSD_SOURCE
#include <features.h>
#ifdef _DEFAULT_SOURCE
/*
headers/compatibility/bsd/endian.h
+2 -1
View File
@@ -7,9 +7,10 @@
#include_next <endian.h>
#include <features.h>
#ifdef _BSD_SOURCE
#ifdef _DEFAULT_SOURCE
#include <config/HaikuConfig.h>
#include <support/ByteOrder.h>
headers/compatibility/bsd/err.h
+2 -1
View File
@@ -37,8 +37,9 @@
#ifndef _ERR_H_
#define _ERR_H_
#include <features.h>
#ifdef _BSD_SOURCE
#ifdef _DEFAULT_SOURCE
/*
headers/compatibility/bsd/errno.h
+2 -1
View File
@@ -7,9 +7,10 @@
#include_next <errno.h>
#include <features.h>
#ifdef _BSD_SOURCE
#ifdef _DEFAULT_SOURCE
#define EDOOFUS EINVAL
headers/compatibility/bsd/features.h
+15
View File
@@ -0,0 +1,15 @@
/*
* Copyright 2019 Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _FEATURES_H
#define _FEATURES_H
#if defined(_BSD_SOURCE) \
|| (!defined(__STRICT_ANSI__) && !defined(_POSIX_C_SOURCE))
#define _DEFAULT_SOURCE
#endif
#endif // _FEATURES_H
headers/compatibility/bsd/ifaddrs.h
+2 -1
View File
@@ -5,8 +5,9 @@
#ifndef _IFADDRS_H
#define _IFADDRS_H
#include <features.h>
#ifdef _BSD_SOURCE
#ifdef _DEFAULT_SOURCE
#ifdef __cplusplus
headers/compatibility/bsd/libutil.h
+2 -1
View File
@@ -39,8 +39,9 @@
#ifndef _LIBUTIL_H_
#define _LIBUTIL_H_
#include <features.h>
#ifdef _BSD_SOURCE
#ifdef _DEFAULT_SOURCE
#include <stdint.h>
headers/compatibility/bsd/netinet/in_systm.h
+4 -1
View File
@@ -6,7 +6,10 @@
#define _NETINET_IN_SYSTM_H_
#ifdef _BSD_SOURCE
#include <features.h>
#ifdef _DEFAULT_SOURCE
#include <stdint.h>
headers/compatibility/bsd/paths.h
+3 -2
View File
@@ -37,8 +37,9 @@
#ifndef _PATHS_H_
#define _PATHS_H_
#include <features.h>
#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
#if defined(_DEFAULT_SOURCE) || defined(_GNU_SOURCE)
#include <sys/cdefs.h>
@@ -141,7 +142,7 @@ __END_DECLS
#endif /* RESCUE */
#endif /* _BSD_SOURCE || _GNU_SOURCE */
#endif /* _DEFAULT_SOURCE || _GNU_SOURCE */
#endif /* !_PATHS_H_ */
headers/compatibility/bsd/pty.h
+2 -1
View File
@@ -5,8 +5,9 @@
#ifndef _BSD_PTY_H_
#define _BSD_PTY_H_
#include <features.h>
#ifdef _BSD_SOURCE
#ifdef _DEFAULT_SOURCE
#include <sys/cdefs.h>
headers/compatibility/bsd/readpassphrase.h
+3 -1
View File
@@ -23,7 +23,9 @@
#ifndef _READPASSPHRASE_H_
#define _READPASSPHRASE_H_
#ifdef _BSD_SOURCE
#include <features.h>
#ifdef _DEFAULT_SOURCE
#define RPP_ECHO_OFF 0x00 /* Turn off echo (default). */
#define RPP_ECHO_ON 0x01 /* Leave echo on. */
headers/compatibility/bsd/signal.h
+2 -1
View File
@@ -7,9 +7,10 @@
#include_next <signal.h>
#include <features.h>
#ifdef _BSD_SOURCE
#ifdef _DEFAULT_SOURCE
#define sigmask(sig) (1 << ((sig) - 1))
headers/compatibility/bsd/stdio.h
+2 -1
View File
@@ -7,9 +7,10 @@
#include_next <stdio.h>
#include <features.h>
#ifdef _BSD_SOURCE
#ifdef _DEFAULT_SOURCE
#ifdef __cplusplus
headers/compatibility/bsd/stdlib.h
+2 -1
View File
@@ -7,9 +7,10 @@
#include_next <stdlib.h>
#include <features.h>
#ifdef _BSD_SOURCE
#ifdef _DEFAULT_SOURCE
#ifdef __cplusplus
headers/compatibility/bsd/string.h
+2 -1
View File
@@ -7,9 +7,10 @@
#include_next <string.h>
#include <features.h>
#ifdef _BSD_SOURCE
#ifdef _DEFAULT_SOURCE
#ifdef __cplusplus
headers/compatibility/bsd/stringlist.h
+2 -1
View File
@@ -36,8 +36,9 @@
#ifndef _STRINGLIST_H
#define _STRINGLIST_H
#include <features.h>
#ifdef _BSD_SOURCE
#ifdef _DEFAULT_SOURCE
#include <sys/cdefs.h>
headers/compatibility/bsd/sys/cdefs.h
+2 -1
View File
@@ -7,9 +7,10 @@
#include_next <sys/cdefs.h>
#include <features.h>
#ifdef _BSD_SOURCE
#ifdef _DEFAULT_SOURCE
#define __FBSDID(x)
headers/compatibility/bsd/sys/ioccom.h
+2 -1
View File
@@ -6,8 +6,9 @@
#ifndef _SYS_IOCCOM_H
#define _SYS_IOCCOM_H
#include <features.h>
#ifdef _BSD_SOURCE
#ifdef _DEFAULT_SOURCE
/**
headers/compatibility/bsd/sys/link_elf.h
+1 -1
View File
@@ -44,7 +44,7 @@
#define _SYS_LINK_ELF_H_
#ifdef _BSD_SOURCE
#ifdef _DEFAULT_SOURCE
#include <os/kernel/elf.h>
headers/compatibility/bsd/sys/md4.h
+2 -1
View File
@@ -27,8 +27,9 @@
#ifndef _MD4_H_
#define _MD4_H_
#include <features.h>
#ifdef _BSD_SOURCE
#ifdef _DEFAULT_SOURCE
/* MD4 context. */
headers/compatibility/bsd/sys/md5.h
+2 -1
View File
@@ -28,8 +28,9 @@ documentation and/or software.
#ifndef _SYS_MD5_H_
#define _SYS_MD5_H_
#include <features.h>
#ifdef _BSD_SOURCE
#ifdef _DEFAULT_SOURCE
#include <stdint.h>
headers/compatibility/bsd/sys/param.h
+2 -1
View File
@@ -7,9 +7,10 @@
#include_next <sys/param.h>
#include <features.h>
#ifdef _BSD_SOURCE
#ifdef _DEFAULT_SOURCE
#ifndef _ALIGNBYTES
headers/compatibility/bsd/sys/queue.h
+3 -2
View File
@@ -33,8 +33,9 @@
#ifndef _SYS_QUEUE_H_
#define _SYS_QUEUE_H_
#include <features.h>
#ifdef _BSD_SOURCE
#ifdef _DEFAULT_SOURCE
#include <sys/cdefs.h>
@@ -619,6 +620,6 @@ void remque(void *a);
#endif /* _KERNEL */
#endif /* _BSD_SOURCE */
#endif /* _DEFAULT_SOURCE */
#endif /* !_SYS_QUEUE_H_ */
headers/compatibility/bsd/sys/time.h
+2 -1
View File
@@ -7,9 +7,10 @@
#include_next <sys/time.h>
#include <features.h>
#ifdef _BSD_SOURCE
#ifdef _DEFAULT_SOURCE
#ifdef __cplusplus
headers/compatibility/bsd/sys/wait.h
+2 -1
View File
@@ -7,9 +7,10 @@
#include_next <sys/wait.h>
#include <features.h>
#ifdef _BSD_SOURCE
#ifdef _DEFAULT_SOURCE
#include <sys/resource.h>
headers/compatibility/bsd/time.h
+2 -1
View File
@@ -7,9 +7,10 @@
#include_next <time.h>
#include <features.h>
#ifdef _BSD_SOURCE
#ifdef _DEFAULT_SOURCE
#ifdef __cplusplus
headers/compatibility/bsd/unistd.h
+2 -1
View File
@@ -7,9 +7,10 @@
#include_next <unistd.h>
#include <features.h>
#ifdef _BSD_SOURCE
#ifdef _DEFAULT_SOURCE
#define L_SET SEEK_SET
headers/compatibility/bsd/vis.h
+2 -1
View File
@@ -35,8 +35,9 @@
#ifndef _VIS_H_
#define _VIS_H_
#include <features.h>
#ifdef _BSD_SOURCE
#ifdef _DEFAULT_SOURCE
#include <sys/types.h>
src/add-ons/kernel/bus_managers/firewire/Jamfile
+1 -1
View File
@@ -4,7 +4,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
UsePrivateHeaders firewire ;
UsePrivateKernelHeaders ;
local defines = [ FDefines _KERNEL=1 _BSD_SOURCE=1 ] ;
local defines = [ FDefines _KERNEL=1 ] ;
SubDirCcFlags $(defines) ;
SubDirC++Flags $(defines) ;
src/add-ons/kernel/drivers/bus/firewire/Jamfile
+1 -1
View File
@@ -4,7 +4,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
UsePrivateHeaders firewire ;
UsePrivateKernelHeaders ;
SubDirCcFlags [ FDefines _KERNEL=1 _BSD_SOURCE=1 ] ;
SubDirCcFlags [ FDefines _KERNEL=1 ] ;
KernelAddon fw_raw :
fw_raw.c
src/add-ons/kernel/drivers/disk/nvme/Jamfile
+1
View File
@@ -2,6 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers disk nvme ;
UsePrivateKernelHeaders ;
SubDirHdrs $(HAIKU_TOP) src system kernel device_manager ;
SubDirSysHdrs $(HAIKU_TOP) headers compatibility bsd ;
UseHeaders [ FDirName $(SUBDIR) ] : true ;
src/add-ons/kernel/drivers/disk/nvme/libnvme/nvme_common.h
+1 -4
View File
@@ -52,11 +52,8 @@
#include <time.h>
#include <sys/types.h>
#include <sys/cdefs.h>
#ifdef __HAIKU__
#define _BSD_SOURCE
#include <compatibility/bsd/sys/queue.h>
#else
#include <sys/queue.h>
#ifndef __HAIKU__
#include <linux/types.h>
#endif
src/add-ons/kernel/file_systems/userlandfs/server/beos/fs_cache.c
-2
View File
@@ -36,8 +36,6 @@
dbg@be.com
*/
#define _BSD_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <memory.h>
src/add-ons/media/media-add-ons/firewire_dv/Jamfile
-1
View File
@@ -5,7 +5,6 @@ UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
UsePrivateHeaders firewire ;
UsePrivateHeaders media ;
UsePrivateHeaders shared ;
SubDirC++Flags [ FDefines _BSD_SOURCE=1 ] ;
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
src/apps/debugger/Jamfile
-2
View File
@@ -32,8 +32,6 @@ UseBuildFeatureHeaders libedit ;
LINKFLAGS += -Wl,--exclude-libs,ALL ;
SubDirC++Flags [ FDefines _BSD_SOURCE=1 ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) settings ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface cli ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface cli commands ] ;
src/bin/fwcontrol/Jamfile
-1
View File
@@ -2,7 +2,6 @@ SubDir HAIKU_TOP src bin fwcontrol ;
UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
UsePrivateHeaders firewire ;
SubDirCcFlags [ FDefines _BSD_SOURCE=1 ] ;
BinCommand fwcontrol :
eui64.c
src/bin/multiuser/Jamfile
-1
View File
@@ -7,7 +7,6 @@ UsePrivateHeaders kernel ;
UsePrivateHeaders libroot ;
UsePrivateHeaders shared ;
UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
SubDirC++Flags [ FDefines _BSD_SOURCE=1 ] ;
StaticLibrary libmultiuser_utils.a : multiuser_utils.cpp ;
src/bin/network/ftpd/Jamfile
-1
View File
@@ -2,7 +2,6 @@ SubDir HAIKU_TOP src bin network ftpd ;
UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
UseHeaders $(SUBDIR) : true ;
SubDirCcFlags [ FDefines _BSD_SOURCE=1 ] ;
BinCommand ftpd :
ftpd.c
src/bin/network/ifconfig/Jamfile
-2
View File
@@ -5,8 +5,6 @@ UsePrivateHeaders net ;
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat ] : true ;
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
SubDirC++Flags [ FDefines _BSD_SOURCE=1 ] ;
BinCommand ifconfig :
ifconfig.cpp
MediaTypes.cpp
src/bin/network/telnet/Jamfile
+1 -1
View File
@@ -6,7 +6,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) src libs libtelnet ] : false ;
UseBuildFeatureHeaders ncurses ;
local defines = [ FDefines USE_TERMIO=1 OLD_ENVIRON=1 ENV_HACK=1 _BSD_SOURCE=1 ] ;
local defines = [ FDefines USE_TERMIO=1 OLD_ENVIRON=1 ENV_HACK=1 ] ;
SubDirCcFlags $(defines) ;
SubDirC++Flags $(defines) ;
src/bin/network/telnetd/Jamfile
+1 -1
View File
@@ -5,7 +5,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
UseHeaders [ FDirName $(HAIKU_TOP) src libs ] : true ;
UseHeaders [ FDirName $(HAIKU_TOP) src libs libtelnet ] : false ;
local defines = [ FDefines USE_TERMIO=1 _BSD_SOURCE=1 ] ;
local defines = [ FDefines USE_TERMIO=1 ] ;
SubDirCcFlags $(defines) ;
SubDirC++Flags $(defines) ;
src/kits/debugger/Jamfile
-2
View File
@@ -34,8 +34,6 @@ UsePrivateSystemHeaders ;
LINKFLAGS += -Wl,--exclude-libs,ALL ;
SubDirC++Flags [ FDefines _BSD_SOURCE=1 ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) arch ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) arch x86 ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) arch x86_64 ] ;
src/kits/network/libnetapi/Jamfile
-2
View File
@@ -8,8 +8,6 @@ UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
UseHeaders [ FDirName $(HAIKU_TOP) headers os add-ons network_settings ]
: true ;
SubDirC++Flags [ FDefines _BSD_SOURCE=1 ] ;
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
src/libs/bsd/Jamfile
-3
View File
@@ -2,9 +2,6 @@ SubDir HAIKU_TOP src libs bsd ;
UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
SubDirCcFlags [ FDefines _BSD_SOURCE=1 ] ;
SubDirC++Flags [ FDefines _BSD_SOURCE=1 ] ;
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
src/libs/libtelnet/Jamfile
-1
View File
@@ -1,7 +1,6 @@
SubDir HAIKU_TOP src libs libtelnet ;
UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
SubDirCcFlags [ FDefines _BSD_SOURCE=1 ] ;
StaticLibrary libtelnet.a :
auth.c
src/libs/util/Jamfile
+1 -1
View File
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src libs util ;
UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
local defines = [ FDefines SCCSID=0 _BSD_SOURCE=1 ] ;
local defines = [ FDefines SCCSID=0 ] ;
SubDirCcFlags $(defines) ;
local architectureObject ;
src/system/libnetwork/Jamfile
-2
View File
@@ -6,8 +6,6 @@ UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
local services = [ FGristFiles services ] ;
SEARCH on $(services) = [ FDirName $(SUBDIR) netresolv defaults ] ;
SubDirC++Flags [ FDefines _BSD_SOURCE=1 ] ;
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
src/system/libnetwork/netresolv/Jamfile
+1 -1
View File
@@ -23,7 +23,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
# we want to have the xxx_r functions, IPv6, and md5 implementation
# we also need to use our BSD compatibility functions
# and enable "lint" to remove the RCSID from all the files.
local defines = _REENTRANT=1 USE_MD5=1 _BSD_SOURCE INET6 lint LINT ;
local defines = _REENTRANT=1 USE_MD5=1 INET6 lint LINT ;
defines = [ FDefines $(defines) ] ;
SubDirCcFlags $(defines) -Wno-sign-compare ;
SubDirC++Flags $(defines) -Wno-sign-compare ;
src/tests/libs/bsd/wait4_test.cpp
-1
View File
@@ -9,7 +9,6 @@
#include <stdio.h>
#include <string.h>
#include <sys/resource.h>
#define _BSD_SOURCE
#include <sys/wait.h>
#include <unistd.h>