LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove duplicated definitions of size_t and ssize_t"

Browse Source
This commit is contained in:
Andrew Hsieh
2012-12-21 15:48:34 -08:00
committed by Gerrit Code Review
parent 852b358185 7980acf254
commit 9a204c557f
7 changed files with 4 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ndk/platforms/android-3/arch-arm/include/machine/_types.h
View File

@@ -35,17 +35,6 @@
#ifndef _ARM__TYPES_H_
#define _ARM__TYPES_H_
#if !defined(__ARM_EABI__)
/* the kernel defines size_t as unsigned int, but g++ wants it to be unsigned long */
#define _SIZE_T
#define _SSIZE_T
#define _PTRDIFF_T
typedef unsigned long size_t;
typedef long ssize_t;
typedef long ptrdiff_t;
#endif
/* 7.18.1.1 Exact-width integer types */
typedef __signed char __int8_t;
typedef unsigned char __uint8_t;

6
ndk/platforms/android-3/include/stdint.h
View File

@@ -226,12 +226,6 @@ typedef int64_t intmax_t;
# define UINTMAX_C(c) UINT64_C(c)
#endif
/* size_t is defined by the GCC-specific <stddef.h> */
#ifndef _SSIZE_T_DEFINED_
#define _SSIZE_T_DEFINED_
typedef long int ssize_t;
#endif
#define _BITSIZE 32
/* Keep the kernel from trying to define these types... */

25
ndk/platforms/android-3/include/stdio.h
View File

@@ -39,7 +39,7 @@
#define _STDIO_H_
#include <sys/cdefs.h>
#include <sys/_types.h>
#include <sys/types.h>
/* va_list and size_t must be defined by stdio.h according to Posix */
#define __need___va_list
@@ -49,30 +49,9 @@
#define __need_size_t
#include <stddef.h>
#define __need_NULL
#include <stddef.h>
#if __BSD_VISIBLE || __POSIX_VISIBLE || __XPG_VISIBLE
#include <sys/types.h> /* XXX should be removed */
#endif
#ifndef _SIZE_T_DEFINED_
#define _SIZE_T_DEFINED_
typedef unsigned long size_t;
#endif
#ifndef _OFF_T_DEFINED_
#define _OFF_T_DEFINED_
typedef long off_t;
#endif
#ifndef NULL
#ifdef __GNUG__
#define NULL __null
#else
#define NULL 0L
#endif
#endif
#define _FSTDIO /* Define for new stdio with functions. */
typedef off_t fpos_t; /* stdio file position type */

6
ndk/platforms/android-3/include/sys/types.h
View File

@@ -85,12 +85,6 @@ typedef .... pthread_rwlock_attr_t;
typedef .... pthread_t;
#endif
#ifndef _SIZE_T_DEFINED_
#define _SIZE_T_DEFINED_
typedef unsigned int size_t;
#endif
/* size_t is defined by the GCC-specific <stddef.h> */
#ifndef _SSIZE_T_DEFINED_
#define _SSIZE_T_DEFINED_
typedef long int ssize_t;

25
ndk/platforms/android-8/include/stdio.h
View File

@@ -39,7 +39,7 @@
#define _STDIO_H_
#include <sys/cdefs.h>
#include <sys/_types.h>
#include <sys/types.h>
/* va_list and size_t must be defined by stdio.h according to Posix */
#define __need___va_list
@@ -49,30 +49,9 @@
#define __need_size_t
#include <stddef.h>
#define __need_NULL
#include <stddef.h>
#if __BSD_VISIBLE || __POSIX_VISIBLE || __XPG_VISIBLE
#include <sys/types.h> /* XXX should be removed */
#endif
#ifndef _SIZE_T_DEFINED_
#define _SIZE_T_DEFINED_
typedef unsigned long size_t;
#endif
#ifndef _OFF_T_DEFINED_
#define _OFF_T_DEFINED_
typedef long off_t;
#endif
#ifndef NULL
#ifdef __GNUG__
#define NULL __null
#else
#define NULL 0L
#endif
#endif
#define _FSTDIO /* Define for new stdio with functions. */
typedef off_t fpos_t; /* stdio file position type */

2
ndk/platforms/android-9/arch-mips/include/machine/_types.h
View File

@@ -105,8 +105,6 @@ typedef double __double_t;
typedef float __float_t;
typedef long long __off_t;
typedef long __ptrdiff_t;
/*typedef unsigned long __size_t;*/
typedef long __ssize_t;
typedef int __time_t;
typedef int __timer_t;
#if defined(__GNUC__) && __GNUC__ >= 3

23
ndk/platforms/android-9/arch-x86/include/machine/_types.h
View File

@@ -35,29 +35,6 @@
#ifndef _I386__TYPES_H_
#define _I386__TYPES_H_
/* the kernel defines size_t as unsigned int, but g++ wants it to be unsigned long */
#ifndef _SIZE_T_DEFINED_
# define _SIZE_T_DEFINED_
# ifdef __ANDROID__
typedef unsigned int size_t;
# else
typedef unsigned long size_t;
# endif
#endif
#if !defined(_SSIZE_T) && !defined(_SSIZE_T_DEFINED_)
#define _SSIZE_T
#define _SSIZE_T_DEFINED_
typedef long int ssize_t;
#endif
#ifndef _PTRDIFF_T
#define _PTRDIFF_T
# ifdef __ANDROID__
typedef int ptrdiff_t;
# else
typedef long ptrdiff_t;
# endif
#endif
/* 7.18.1.1 Exact-width integer types */
typedef __signed char __int8_t;
typedef unsigned char __uint8_t;