Index: simd/jsimdcfg.inc.h |
diff --git a/simd/jsimdcfg.inc.h b/simd/jsimdcfg.inc.h |
index 583b7e325be877fd0afa37f56d7332d4464fe10a..d2b499faef13582128d92e0c65b6fb1da48d6adf 100644 |
--- a/simd/jsimdcfg.inc.h |
+++ b/simd/jsimdcfg.inc.h |
@@ -84,10 +84,10 @@ |
%define JDIMENSION dword ; unsigned int |
%define SIZEOF_JDIMENSION SIZEOF_DWORD ; sizeof(JDIMENSION) |
-%define JSAMPROW POINTER ; JSAMPLE FAR * (jpeglib.h) |
+%define JSAMPROW POINTER ; JSAMPLE * (jpeglib.h) |
%define JSAMPARRAY POINTER ; JSAMPROW * (jpeglib.h) |
%define JSAMPIMAGE POINTER ; JSAMPARRAY * (jpeglib.h) |
-%define JCOEFPTR POINTER ; JCOEF FAR * (jpeglib.h) |
+%define JCOEFPTR POINTER ; JCOEF * (jpeglib.h) |
%define SIZEOF_JSAMPROW SIZEOF_POINTER ; sizeof(JSAMPROW) |
%define SIZEOF_JSAMPARRAY SIZEOF_POINTER ; sizeof(JSAMPARRAY) |
%define SIZEOF_JSAMPIMAGE SIZEOF_POINTER ; sizeof(JSAMPIMAGE) |
@@ -128,69 +128,3 @@ |
%define _cpp_protection_JSIMD_3DNOW JSIMD_3DNOW |
%define _cpp_protection_JSIMD_SSE JSIMD_SSE |
%define _cpp_protection_JSIMD_SSE2 JSIMD_SSE2 |
- |
-; Short forms of external names for systems with brain-damaged linkers. |
-; |
-#ifdef NEED_SHORT_EXTERNAL_NAMES |
-%define _cpp_protection_jpeg_simd_cpu_support jpeg_simd_cpu_support |
-%define _cpp_protection_jsimd_rgb_ycc_convert_mmx jsimd_rgb_ycc_convert_mmx |
-%define _cpp_protection_jsimd_ycc_rgb_convert_mmx jsimd_ycc_rgb_convert_mmx |
-%define _cpp_protection_jconst_rgb_ycc_convert_sse2 jconst_rgb_ycc_convert_sse2 |
-%define _cpp_protection_jsimd_rgb_ycc_convert_sse2 jsimd_rgb_ycc_convert_sse2 |
-%define _cpp_protection_jconst_ycc_rgb_convert_sse2 jconst_ycc_rgb_convert_sse2 |
-%define _cpp_protection_jsimd_ycc_rgb_convert_sse2 jsimd_ycc_rgb_convert_sse2 |
-%define _cpp_protection_jsimd_h2v2_downsample_mmx jsimd_h2v2_downsample_mmx |
-%define _cpp_protection_jsimd_h2v1_downsample_mmx jsimd_h2v1_downsample_mmx |
-%define _cpp_protection_jsimd_h2v2_downsample_sse2 jsimd_h2v2_downsample_sse2 |
-%define _cpp_protection_jsimd_h2v1_downsample_sse2 jsimd_h2v1_downsample_sse2 |
-%define _cpp_protection_jsimd_h2v2_upsample_mmx jsimd_h2v2_upsample_mmx |
-%define _cpp_protection_jsimd_h2v1_upsample_mmx jsimd_h2v1_upsample_mmx |
-%define _cpp_protection_jsimd_h2v1_fancy_upsample_mmx jsimd_h2v1_fancy_upsample_mmx |
-%define _cpp_protection_jsimd_h2v2_fancy_upsample_mmx jsimd_h2v2_fancy_upsample_mmx |
-%define _cpp_protection_jsimd_h2v1_merged_upsample_mmx jsimd_h2v1_merged_upsample_mmx |
-%define _cpp_protection_jsimd_h2v2_merged_upsample_mmx jsimd_h2v2_merged_upsample_mmx |
-%define _cpp_protection_jsimd_h2v2_upsample_sse2 jsimd_h2v2_upsample_sse2 |
-%define _cpp_protection_jsimd_h2v1_upsample_sse2 jsimd_h2v1_upsample_sse2 |
-%define _cpp_protection_jconst_fancy_upsample_sse2 jconst_fancy_upsample_sse2 |
-%define _cpp_protection_jsimd_h2v1_fancy_upsample_sse2 jsimd_h2v1_fancy_upsample_sse2 |
-%define _cpp_protection_jsimd_h2v2_fancy_upsample_sse2 jsimd_h2v2_fancy_upsample_sse2 |
-%define _cpp_protection_jconst_merged_upsample_sse2 jconst_merged_upsample_sse2 |
-%define _cpp_protection_jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_merged_upsample_sse2 |
-%define _cpp_protection_jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_merged_upsample_sse2 |
-%define _cpp_protection_jsimd_convsamp_mmx jsimd_convsamp_mmx |
-%define _cpp_protection_jsimd_convsamp_sse2 jsimd_convsamp_sse2 |
-%define _cpp_protection_jsimd_convsamp_float_3dnow jsimd_convsamp_float_3dnow |
-%define _cpp_protection_jsimd_convsamp_float_sse jsimd_convsamp_float_sse |
-%define _cpp_protection_jsimd_convsamp_float_sse2 jsimd_convsamp_float_sse2 |
-%define _cpp_protection_jsimd_fdct_islow_mmx jsimd_fdct_islow_mmx |
-%define _cpp_protection_jsimd_fdct_ifast_mmx jsimd_fdct_ifast_mmx |
-%define _cpp_protection_jconst_fdct_islow_sse2 jconst_fdct_islow_sse2 |
-%define _cpp_protection_jsimd_fdct_islow_sse2 jsimd_fdct_islow_sse2 |
-%define _cpp_protection_jconst_fdct_ifast_sse2 jconst_fdct_ifast_sse2 |
-%define _cpp_protection_jsimd_fdct_ifast_sse2 jsimd_fdct_ifast_sse2 |
-%define _cpp_protection_jsimd_fdct_float_3dnow jsimd_fdct_float_3dnow |
-%define _cpp_protection_jconst_fdct_float_sse jconst_fdct_float_sse |
-%define _cpp_protection_jsimd_fdct_float_sse jsimd_fdct_float_sse |
-%define _cpp_protection_jsimd_quantize_mmx jsimd_quantize_mmx |
-%define _cpp_protection_jsimd_quantize_sse2 jsimd_quantize_sse2 |
-%define _cpp_protection_jsimd_quantize_float_3dnow jsimd_quantize_float_3dnow |
-%define _cpp_protection_jsimd_quantize_float_sse jsimd_quantize_float_sse |
-%define _cpp_protection_jsimd_quantize_float_sse2 jsimd_quantize_float_sse2 |
-%define _cpp_protection_jsimd_idct_2x2_mmx jsimd_idct_2x2_mmx |
-%define _cpp_protection_jsimd_idct_4x4_mmx jsimd_idct_4x4_mmx |
-%define _cpp_protection_jconst_idct_red_sse2 jconst_idct_red_sse2 |
-%define _cpp_protection_jsimd_idct_2x2_sse2 jsimd_idct_2x2_sse2 |
-%define _cpp_protection_jsimd_idct_4x4_sse2 jsimd_idct_4x4_sse2 |
-%define _cpp_protection_jsimd_idct_islow_mmx jsimd_idct_islow_mmx |
-%define _cpp_protection_jsimd_idct_ifast_mmx jsimd_idct_ifast_mmx |
-%define _cpp_protection_jconst_idct_islow_sse2 jconst_idct_islow_sse2 |
-%define _cpp_protection_jsimd_idct_islow_sse2 jsimd_idct_islow_sse2 |
-%define _cpp_protection_jconst_idct_ifast_sse2 jconst_idct_ifast_sse2 |
-%define _cpp_protection_jsimd_idct_ifast_sse2 jsimd_idct_ifast_sse2 |
-%define _cpp_protection_jsimd_idct_float_3dnow jsimd_idct_float_3dnow |
-%define _cpp_protection_jconst_idct_float_sse jconst_idct_float_sse |
-%define _cpp_protection_jsimd_idct_float_sse jsimd_idct_float_sse |
-%define _cpp_protection_jconst_idct_float_sse2 jconst_idct_float_sse2 |
-%define _cpp_protection_jsimd_idct_float_sse2 jsimd_idct_float_sse2 |
-#endif /* NEED_SHORT_EXTERNAL_NAMES */ |
- |