Merge pull request #538 from mstorsjo/use-apple-builtin-define

Use __APPLE__ instead of APPLE_IOS for apple/arm specific features

volvet committed 12 years ago

Commit 7313ecd2 parents 4bbe61a 9586c5911 files · +16 −16Browse files

Showing the changes to codec/decoder (2 of 11 files). Show all

Unified · Split

2 files

@@ -33,7 +33,7 @@ · 32 unmodified lines
33	#ifdef HAVE_NEON	33	#ifdef HAVE_NEON
34	.text	34	.text
35	#include "arm_arch_common_macro.S"	35	#include "arm_arch_common_macro.S"
36	#ifdef APPLE_IOS	36	#ifdef __APPLE__
37		37
38	.macro ROW_TRANSFORM_1_STEP	38	.macro ROW_TRANSFORM_1_STEP
39	// { // input: src_d[0]~[3], output: e_q[0]~[3]; working: $8 $9	39	// { // input: src_d[0]~[3], output: e_q[0]~[3]; working: $8 $9

@@ -35,7 +35,7 @@ · 34 unmodified lines
35	.text	35	.text
36	#include "arm_arch_common_macro.S"	36	#include "arm_arch_common_macro.S"
37		37
38	#ifdef APPLE_IOS	38	#ifdef __APPLE__
39	//Global macro	39	//Global macro
40	.macro GET_8BYTE_DATA	40	.macro GET_8BYTE_DATA
41	vld1.8 {$0[0]}, [$1], $2	41	vld1.8 {$0[0]}, [$1], $2

Keyboard shortcuts