Merge change 20154 (b230e426) · Commits · e / os / android_system_core

include/arch/darwin-x86/AndroidConfig.h

+11 −3

Original line number	Original line	Diff line number	Diff line
	@@ -15,9 +15,7 @@
	*/		*/

	/*		/*
	* Android config -- "Darwin". Used for PPC Mac OS X.		* Android config -- "Darwin". Used for X86 Mac OS X.
	*
	* TODO: split this into "x86" and "ppc" versions
	*/		*/
	#ifndef _ANDROID_CONFIG_H		#ifndef _ANDROID_CONFIG_H
	#define _ANDROID_CONFIG_H		#define _ANDROID_CONFIG_H
	@@ -257,4 +255,14 @@
	*/		*/
	#define HAVE_WRITEV 1		#define HAVE_WRITEV 1

			/*
			* Define if <stdint.h> exists.
			*/
			#define HAVE_STDINT_H 1

			/*
			* Define if <stdbool.h> exists.
			*/
			#define HAVE_STDBOOL_H 1

	#endif /_ANDROID_CONFIG_H/		#endif /_ANDROID_CONFIG_H/

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -314,4 +314,14 @@
	#define CLOCK_PROCESS_CPUTIME_ID CLOCK_PROF		#define CLOCK_PROCESS_CPUTIME_ID CLOCK_PROF
	#endif		#endif

			/*
			* Define if <stdint.h> exists.
			*/
			/* #define HAVE_STDINT_H */

			/*
			* Define if <stdbool.h> exists.
			*/
			/* #define HAVE_STDBOOL_H */

	#endif /_ANDROID_CONFIG_H/		#endif /_ANDROID_CONFIG_H/

+10 −0

+10 −0

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -293,4 +293,14 @@
	*/		*/
	#define HAVE_UNWIND_CONTEXT_STRUCT		#define HAVE_UNWIND_CONTEXT_STRUCT

			/*
			* Define if <stdint.h> exists.
			*/
			#define HAVE_STDINT_H 1

			/*
			* Define if <stdbool.h> exists.
			*/
			#define HAVE_STDBOOL_H 1

	#endif /* _ANDROID_CONFIG_H */		#endif /* _ANDROID_CONFIG_H */