History

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/processing (2 of 11 files). Show all

Unified · Split

2 files
  1. codec/processing/src/arm/adaptive_quantization.S +1 −1
  2. codec/processing/src/arm/vaa_calc_neon.S +5 −5
codec/processing/src/arm/adaptive_quantization.S+1−1
@@ -34,7 +34,7 @@ · 33 unmodified lines
3434 .text
3535 #include "arm_arch_common_macro.S"
3636
37−#ifdef APPLE_IOS
37+#ifdef __APPLE__
3838 .macro SQR_ADD_16BYTES
3939 vmull.u8 q3, $0, $0
4040 vmull.u8 q8, $1, $1
codec/processing/src/arm/vaa_calc_neon.S+5−5
@@ -34,7 +34,7 @@ · 33 unmodified lines
3434 .text
3535 #include "arm_arch_common_macro.S"
3636
37−#ifdef APPLE_IOS
37+#ifdef __APPLE__
3838
3939 .macro ABS_SUB_SUM_16BYTES
4040 vld1.32 {q15}, [$0], $2
@@ -160,7 +160,7 @@ vaa_calc_sad_loop1: · 119 unmodified lines
160160 WELS_ASM_FUNC_END
161161
162162
163−#ifdef APPLE_IOS
163+#ifdef __APPLE__
164164 .macro SAD_SD_MAD_16BYTES
165165 vld1.32 {q0}, [$0], $2
166166 vld1.32 {q1}, [$1], $2
@@ -314,7 +314,7 @@ vaa_calc_sad_bgd_loop1: · 147 unmodified lines
314314 WELS_ASM_FUNC_END
315315
316316
317−#ifdef APPLE_IOS
317+#ifdef __APPLE__
318318 .macro SSD_MUL_SUM_16BYTES_RESET
319319 vmull.u8 $3, $0, $0
320320 vpaddl.u16 $2, $3
@@ -712,7 +712,7 @@ bne vaa_calc_sad_ssd_bgd_height_loop · 391 unmodified lines
712712 WELS_ASM_FUNC_END
713713
714714
715−#ifdef APPLE_IOS
715+#ifdef __APPLE__
716716 .macro SAD_VAR_16
717717 vld1.8 {q0}, [$0], $2 //load cur_row
718718
@@ -971,7 +971,7 @@ bne vaa_calc_sad_var_height_loop · 252 unmodified lines
971971 WELS_ASM_FUNC_END
972972
973973
974−#ifdef APPLE_IOS
974+#ifdef __APPLE__
975975 .macro SAD_SSD_16
976976 SAD_VAR_16 $0, $1, $2, $3
977977

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t