tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 07c0b73a: Merge "Remove (near-)duplicate definitions of size_t and ssize_t."

Browse source 
* commit '07c0b73a7fc9214e50fc6b9a15a06aeef0506e0f':
  Remove (near-)duplicate definitions of size_t and ssize_t.
This commit is contained in:
Elliott Hughes 2012-11-29 19:43:50 -08:00 committed by Android Git Automerger
commit 55210f74c7
7 changed files with 1 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libc/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;

2
libc/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
libc/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;

7
libc/include/search.h
View file

@ -12,13 +12,6 @@
#include <sys/cdefs.h>
#include <sys/_types.h>
#if 0
#ifndef _SIZE_T_DECLARED
typedef __size_t size_t;
#define _SIZE_T_DECLARED
#endif
#endif
typedef enum {
preorder,
postorder,

6
libc/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... */

21
libc/include/stdio.h
View file

@ -39,30 +39,11 @@
#define _STDIO_H_
#include <sys/cdefs.h>
#include <sys/_types.h>
#include <sys/types.h>
#include <stdarg.h>
#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 int size_t;
#endif
#ifndef _SSIZE_T_DEFINED_
#define _SSIZE_T_DEFINED_
typedef long int ssize_t;
#endif
#ifndef _OFF_T_DEFINED_
#define _OFF_T_DEFINED_
typedef long off_t;
#endif
#define __need_NULL
#include <stddef.h>

5
libc/include/sys/types.h
View file

@ -83,11 +83,6 @@ typedef .... pthread_rwlock_attr_t;
typedef .... pthread_t;
#endif
#ifndef _SIZE_T_DEFINED_
#define _SIZE_T_DEFINED_
typedef unsigned int size_t;
#endif
#ifndef _SSIZE_T_DEFINED_
#define _SSIZE_T_DEFINED_
typedef long int ssize_t;