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

am 0f97bab8: Merge changes Ibee74a22,Ifef4dc98

Browse Source 
* commit '0f97bab8f00d37409bb7f3c3f7644a16e7cbbbb0':
  NDK: x86 header file has incorrect definition for ptrdiff_t
  Fix size_t definition in x86 NDK header file
This commit is contained in:
David Turner
2011-08-05 08:00:24 -07:00
committed by Android Git Automerger
parent f8e7650304 0f97bab8f0
commit 254a709075
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@
/* the kernel defines size_t as unsigned int, but g++ wants it to be unsigned long */ /* the kernel defines size_t as unsigned int, but g++ wants it to be unsigned long */
#ifndef _SIZE_T_DEFINED_ #ifndef _SIZE_T_DEFINED_
# define _SIZE_T_DEFINED_ # define _SIZE_T_DEFINED_
# ifdef ANDROID # ifdef __ANDROID__
typedef unsigned int size_t; typedef unsigned int size_t;
# else # else
typedef unsigned long size_t; typedef unsigned long size_t;
@@ -51,7 +51,11 @@ typedef long int ssize_t;
#endif #endif
#ifndef _PTRDIFF_T #ifndef _PTRDIFF_T
#define _PTRDIFF_T #define _PTRDIFF_T
typedef long ptrdiff_t; # ifdef __ANDROID__
typedef int ptrdiff_t;
# else
typedef long ptrdiff_t;
# endif
#endif #endif
#include <linux/types.h> #include <linux/types.h>