generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am e4fcc3ad: Merge "Fix _BSD_SOURCE/__USE_BSD."

Browse Source 
* commit 'e4fcc3ad2b2965858571f5fb7d485ceb7e4a8266':
  Fix _BSD_SOURCE/__USE_BSD.
This commit is contained in:
Elliott Hughes
2014-08-19 17:11:21 +00:00
committed by Android Git Automerger
parent 707ed62b9f e4fcc3ad2b
commit ecd48356e3
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libc/include/sys/stat.h
View File

@@ -25,9 +25,11 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#ifndef _SYS_STAT_H_ #ifndef _SYS_STAT_H_
#define _SYS_STAT_H_ #define _SYS_STAT_H_
#include <features.h>
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/time.h> #include <sys/time.h>

2
libc/upstream-freebsd/android/include/freebsd-compat.h
View File

@@ -17,7 +17,7 @@
#ifndef _BIONIC_FREEBSD_COMPAT_H_included #ifndef _BIONIC_FREEBSD_COMPAT_H_included
#define _BIONIC_FREEBSD_COMPAT_H_included #define _BIONIC_FREEBSD_COMPAT_H_included
#define __USE_BSD #define _BSD_SOURCE
#define REPLACE_GETOPT #define REPLACE_GETOPT
/* /*

6
libc/upstream-netbsd/android/include/netbsd-compat.h
View File

@@ -17,6 +17,9 @@
#ifndef _BIONIC_NETBSD_COMPAT_H_included #ifndef _BIONIC_NETBSD_COMPAT_H_included
#define _BIONIC_NETBSD_COMPAT_H_included #define _BIONIC_NETBSD_COMPAT_H_included
#define _BSD_SOURCE
#define _GNU_SOURCE
// NetBSD uses _DIAGASSERT to null-check arguments and the like. // NetBSD uses _DIAGASSERT to null-check arguments and the like.
#include <assert.h> #include <assert.h>
#define _DIAGASSERT(e) ((e) ? (void) 0 : __assert2(__FILE__, __LINE__, __func__, #e)) #define _DIAGASSERT(e) ((e) ? (void) 0 : __assert2(__FILE__, __LINE__, __func__, #e))
@@ -24,9 +27,6 @@
// TODO: update our <sys/cdefs.h> to support this properly. // TODO: update our <sys/cdefs.h> to support this properly.
#define __type_fit(t, a) (0 == 0) #define __type_fit(t, a) (0 == 0)
#define _GNU_SOURCE
#define __USE_BSD
// TODO: we don't yet have thread-safe environment variables. // TODO: we don't yet have thread-safe environment variables.
#define __readlockenv() 0 #define __readlockenv() 0
#define __unlockenv() 0 #define __unlockenv() 0

4
libc/upstream-openbsd/android/include/openbsd-compat.h
View File

@@ -17,11 +17,11 @@
#ifndef _BIONIC_OPENBSD_COMPAT_H_included #ifndef _BIONIC_OPENBSD_COMPAT_H_included
#define _BIONIC_OPENBSD_COMPAT_H_included #define _BIONIC_OPENBSD_COMPAT_H_included
#define _BSD_SOURCE
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <stddef.h> // For size_t. #include <stddef.h> // For size_t.
#define __USE_BSD
/* OpenBSD's <ctype.h> uses these names, which conflicted with stlport. /* OpenBSD's <ctype.h> uses these names, which conflicted with stlport.
* Additionally, we changed the numeric/digit type from N to D for libcxx. * Additionally, we changed the numeric/digit type from N to D for libcxx.
*/ */