[xiph-commits] r12503 - trunk/speex/include/speex

[jm at svn.xiph.org]

Author: jm
Date: 2007-02-21 06:37:36 -0800 (Wed, 21 Feb 2007)
New Revision: 12503

Modified:
   trunk/speex/include/speex/speex_resampler.h
Log:
Yay, it gets even uglier...


Modified: trunk/speex/include/speex/speex_resampler.h
===================================================================
--- trunk/speex/include/speex/speex_resampler.h	2007-02-21 13:55:00 UTC (rev 12502)
+++ trunk/speex/include/speex/speex_resampler.h	2007-02-21 14:37:36 UTC (rev 12503)
@@ -46,30 +46,33 @@
 /* If the resampler is defined outside of Speex, we change the symbol names so that 
    there won't be any clash if linking with Speex later on. */
 
-/* #define RANDOM_PREFIX your software name */
+/* #define RANDOM_PREFIX your software name here */
 #ifndef RANDOM_PREFIX
-#error Please define RANDOM_PREFIX (above) to something specific to your project to prevent symbol name clashes
+#error "Please define RANDOM_PREFIX (above) to something specific to your project to prevent symbol name clashes"
 #endif
 
-#define speex_resampler_init RANDOM_PREFIX ## _resampler_init
-#define speex_resampler_init_frac RANDOM_PREFIX ## _resampler_init_frac
-#define speex_resampler_destroy RANDOM_PREFIX ## _resampler_destroy
-#define speex_resampler_process_float RANDOM_PREFIX ## _resampler_process_float
-#define speex_resampler_process_int RANDOM_PREFIX ## _resampler_process_int
-#define speex_resampler_process_interleaved_float RANDOM_PREFIX ## _resampler_process_interleaved_float
-#define speex_resampler_process_interleaved_int RANDOM_PREFIX ## _resampler_process_interleaved_int
-#define speex_resampler_set_rate RANDOM_PREFIX ## _resampler_set_rate
-#define speex_resampler_get_rate RANDOM_PREFIX ## _resampler_get_rate
-#define speex_resampler_set_rate_frac RANDOM_PREFIX ## _resampler_set_rate_frac
-#define speex_resampler_get_ratio RANDOM_PREFIX ## _resampler_get_ratio
-#define speex_resampler_set_quality RANDOM_PREFIX ## _resampler_set_quality
-#define speex_resampler_get_quality RANDOM_PREFIX ## _resampler_get_quality
-#define speex_resampler_set_input_stride RANDOM_PREFIX ## _resampler_set_input_stride
-#define speex_resampler_get_input_stride RANDOM_PREFIX ## _resampler_get_input_stride
-#define speex_resample_set_output_stride RANDOM_PREFIX ## _resample_set_output_stride
-#define speex_resample_get_output_stride RANDOM_PREFIX ## _resample_get_output_stride
-#define speex_resampler_skip_zeros RANDOM_PREFIX ## _resampler_skip_zeros
-#define speex_resampler_reset_mem RANDOM_PREFIX ## _resampler_reset_mem
+#define CAT_PREFIX2(a,b) a ## b
+#define CAT_PREFIX(a,b) CAT_PREFIX2(a, b)
+      
+#define speex_resampler_init CAT_PREFIX(RANDOM_PREFIX,_resampler_init)
+#define speex_resampler_init_frac CAT_PREFIX(RANDOM_PREFIX,_resampler_init_frac)
+#define speex_resampler_destroy CAT_PREFIX(RANDOM_PREFIX,_resampler_destroy)
+#define speex_resampler_process_float CAT_PREFIX(RANDOM_PREFIX,_resampler_process_float)
+#define speex_resampler_process_int CAT_PREFIX(RANDOM_PREFIX,_resampler_process_int)
+#define speex_resampler_process_interleaved_float CAT_PREFIX(RANDOM_PREFIX,_resampler_process_interleaved_float)
+#define speex_resampler_process_interleaved_int CAT_PREFIX(RANDOM_PREFIX,_resampler_process_interleaved_int)
+#define speex_resampler_set_rate CAT_PREFIX(RANDOM_PREFIX,_resampler_set_rate)
+#define speex_resampler_get_rate CAT_PREFIX(RANDOM_PREFIX,_resampler_get_rate)
+#define speex_resampler_set_rate_frac CAT_PREFIX(RANDOM_PREFIX,_resampler_set_rate_frac)
+#define speex_resampler_get_ratio CAT_PREFIX(RANDOM_PREFIX,_resampler_get_ratio)
+#define speex_resampler_set_quality CAT_PREFIX(RANDOM_PREFIX,_resampler_set_quality)
+#define speex_resampler_get_quality CAT_PREFIX(RANDOM_PREFIX,_resampler_get_quality)
+#define speex_resampler_set_input_stride CAT_PREFIX(RANDOM_PREFIX,_resampler_set_input_stride)
+#define speex_resampler_get_input_stride CAT_PREFIX(RANDOM_PREFIX,_resampler_get_input_stride)
+#define speex_resample_set_output_stride CAT_PREFIX(RANDOM_PREFIX,_resample_set_output_stride)
+#define speex_resample_get_output_stride CAT_PREFIX(RANDOM_PREFIX,_resample_get_output_stride)
+#define speex_resampler_skip_zeros CAT_PREFIX(RANDOM_PREFIX,_resampler_skip_zeros)
+#define speex_resampler_reset_mem CAT_PREFIX(RANDOM_PREFIX,_resampler_reset_mem)
 
 #define spx_int16_t short