From 030b452b8d6c95be6b6de661aed96e8379d1a80e Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Tue, 22 May 2012 22:12:10 -0400 Subject: [PATCH] fix missing _BSD_SOURCE support in bits/*.h this is actually rather ugly, and would get even uglier if we ever want to support further feature test macros. at some point i may factor the bits headers into separate files for C base, POSIX base, and nonstandard extensions (the only distinctions that seem to matter now) and then the logic for which to include can go in the main header rather than being duplicated for each arch. the downside of this is that it would result in more files having to be opened during compilation, so as long as the ugliness does not grow, i'm inclined to leave it alone for now. --- arch/arm/bits/limits.h | 2 +- arch/arm/bits/mman.h | 2 +- arch/arm/bits/signal.h | 4 ++-- arch/i386/bits/limits.h | 2 +- arch/i386/bits/mman.h | 2 +- arch/i386/bits/signal.h | 4 ++-- arch/x86_64/bits/limits.h | 2 +- arch/x86_64/bits/mman.h | 2 +- arch/x86_64/bits/signal.h | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm/bits/limits.h b/arch/arm/bits/limits.h index e19461df..65a3dd64 100644 --- a/arch/arm/bits/limits.h +++ b/arch/arm/bits/limits.h @@ -1,5 +1,5 @@ #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ - || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) + || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) #define PAGE_SIZE 4096 #define LONG_BIT 32 #endif diff --git a/arch/arm/bits/mman.h b/arch/arm/bits/mman.h index 302044eb..03f961e8 100644 --- a/arch/arm/bits/mman.h +++ b/arch/arm/bits/mman.h @@ -30,7 +30,7 @@ #define MCL_CURRENT 1 #define MCL_FUTURE 2 -#ifdef _GNU_SOURCE +#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) #define MADV_NORMAL 0 #define MADV_RANDOM 1 #define MADV_SEQUENTIAL 2 diff --git a/arch/arm/bits/signal.h b/arch/arm/bits/signal.h index 16f029b4..328388d4 100644 --- a/arch/arm/bits/signal.h +++ b/arch/arm/bits/signal.h @@ -1,5 +1,5 @@ #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ - || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) + || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) typedef struct { unsigned long __regs[21]; @@ -23,7 +23,7 @@ typedef struct __ucontext { #define SA_RESETHAND 0x80000000 #define SA_RESTORER 0x04000000 -#ifdef _GNU_SOURCE +#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) struct sigcontext { unsigned long trap_no, error_code, oldmask; diff --git a/arch/i386/bits/limits.h b/arch/i386/bits/limits.h index e19461df..65a3dd64 100644 --- a/arch/i386/bits/limits.h +++ b/arch/i386/bits/limits.h @@ -1,5 +1,5 @@ #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ - || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) + || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) #define PAGE_SIZE 4096 #define LONG_BIT 32 #endif diff --git a/arch/i386/bits/mman.h b/arch/i386/bits/mman.h index 302044eb..03f961e8 100644 --- a/arch/i386/bits/mman.h +++ b/arch/i386/bits/mman.h @@ -30,7 +30,7 @@ #define MCL_CURRENT 1 #define MCL_FUTURE 2 -#ifdef _GNU_SOURCE +#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) #define MADV_NORMAL 0 #define MADV_RANDOM 1 #define MADV_SEQUENTIAL 2 diff --git a/arch/i386/bits/signal.h b/arch/i386/bits/signal.h index 6a55f944..ab9a92cb 100644 --- a/arch/i386/bits/signal.h +++ b/arch/i386/bits/signal.h @@ -1,5 +1,5 @@ #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ - || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) + || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) struct __fpstate { unsigned long __x[7]; @@ -31,7 +31,7 @@ typedef struct __ucontext { #define SA_RESETHAND 0x80000000 #define SA_RESTORER 0x04000000 -#ifdef _GNU_SOURCE +#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) struct sigcontext { unsigned short gs, __gsh, fs, __fsh, es, __esh, ds, __dsh; unsigned long edi, esi, ebp, esp, ebx, edx, ecx, eax; diff --git a/arch/x86_64/bits/limits.h b/arch/x86_64/bits/limits.h index 2ba566bf..792a30b9 100644 --- a/arch/x86_64/bits/limits.h +++ b/arch/x86_64/bits/limits.h @@ -1,5 +1,5 @@ #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ - || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) + || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) #define PAGE_SIZE 4096 #define LONG_BIT 64 #endif diff --git a/arch/x86_64/bits/mman.h b/arch/x86_64/bits/mman.h index dc61b500..80ed39fa 100644 --- a/arch/x86_64/bits/mman.h +++ b/arch/x86_64/bits/mman.h @@ -30,7 +30,7 @@ #define MCL_CURRENT 1 #define MCL_FUTURE 2 -#ifdef _GNU_SOURCE +#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) #define MADV_NORMAL 0 #define MADV_RANDOM 1 #define MADV_SEQUENTIAL 2 diff --git a/arch/x86_64/bits/signal.h b/arch/x86_64/bits/signal.h index ecc4e9ff..11375b9a 100644 --- a/arch/x86_64/bits/signal.h +++ b/arch/x86_64/bits/signal.h @@ -1,5 +1,5 @@ #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ - || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) + || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) struct __fpstate { unsigned long __x[4]; @@ -31,7 +31,7 @@ typedef struct __ucontext { #define SA_RESETHAND 0x80000000 #define SA_RESTORER 0x04000000 -#ifdef _GNU_SOURCE +#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) struct sigcontext { unsigned long r8, r9, r10, r11, r12, r13, r14, r15; unsigned long rdi, rsi, rbp, rbx, rdx, rax, rcx, rsp, rip, eflags; -- 2.25.1