Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory usw-pr-cvs1:/tmp/cvs-serv32124/src/pcm
Modified Files:
pcm.c pcm_local.h
Log Message:
fixed the build without versioned symbols.
the rc4 symbols are defined as __ prefix, which are aliased in
pcm.h as well as the versioned symbol binary.
Index: pcm.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm.c,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- pcm.c 9 Oct 2002 06:13:57 -0000 1.223
+++ pcm.c 10 Oct 2002 11:01:19 -0000 1.224
@@ -6173,8 +6173,14 @@
symbol_version(__old_##name, name, what);
#endif
-#define __OLD_GET(name, val_type, ret_type) \
-ret_type __old_##name(const snd_pcm_hw_params_t *params) \
+#else
+
+#define OBSOLETE1(name, what, new) /**/
+
+#endif /* USE_VERSIONED_SYMBOLS */
+
+#define __P_OLD_GET(pfx, name, val_type, ret_type) \
+ret_type pfx##name(const snd_pcm_hw_params_t *params) \
{ \
val_type val; \
if (INTERNAL(name)(params, &val) < 0) \
@@ -6182,8 +6188,8 @@
return (ret_type)val; \
}
-#define __OLD_GET1(name, val_type, ret_type) \
-ret_type __old_##name(const snd_pcm_hw_params_t *params, int *dir) \
+#define __P_OLD_GET1(pfx, name, val_type, ret_type) \
+ret_type pfx##name(const snd_pcm_hw_params_t *params, int *dir) \
{ \
val_type val; \
if (INTERNAL(name)(params, &val, dir) < 0) \
@@ -6191,6 +6197,14 @@
return (ret_type)val; \
}
+#ifdef USE_VERSIONED_SYMBOLS
+#define __OLD_GET(name, val_type, ret_type) __P_OLD_GET(__old_, name, val_type,
+ret_type)
+#define __OLD_GET1(name, val_type, ret_type) __P_OLD_GET1(__old_, name, val_type,
+ret_type)
+#else
+#define __OLD_GET(name, val_type, ret_type) __P_OLD_GET(, name, val_type, ret_type)
+#define __OLD_GET1(name, val_type, ret_type) __P_OLD_GET1(, name, val_type, ret_type)
+#endif
+
__OLD_GET(snd_pcm_hw_params_get_access, snd_pcm_access_t, int);
__OLD_GET(snd_pcm_hw_params_get_format, snd_pcm_format_t, int);
__OLD_GET(snd_pcm_hw_params_get_subformat, snd_pcm_subformat_t, int);
@@ -6221,22 +6235,30 @@
__OLD_GET(snd_pcm_hw_params_get_buffer_size_max, snd_pcm_uframes_t,
snd_pcm_uframes_t);
__OLD_GET1(snd_pcm_hw_params_get_tick_time_max, unsigned int, unsigned int);
-#define __OLD_NEAR(name, ret_type) \
-ret_type __old_##name(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, ret_type val) \
+#define __P_OLD_NEAR(pfx, name, ret_type) \
+ret_type pfx##name(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, ret_type val) \
{ \
if (INTERNAL(name)(pcm, params, &val) < 0) \
return 0; \
return (ret_type)val; \
}
-#define __OLD_NEAR1(name, ret_type) \
-ret_type __old_##name(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, ret_type val, int
*dir) \
+#define __P_OLD_NEAR1(pfx, name, ret_type) \
+ret_type pfx##name(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, ret_type val, int
+*dir) \
{ \
if (INTERNAL(name)(pcm, params, &val, dir) < 0) \
return 0; \
return (ret_type)val; \
}
+#ifdef USE_VERSIONED_SYMBOLS
+#define __OLD_NEAR(name, ret_type) __P_OLD_NEAR(__old_, name, ret_type)
+#define __OLD_NEAR1(name, ret_type) __P_OLD_NEAR1(__old_, name, ret_type)
+#else
+#define __OLD_NEAR(name, ret_type) __P_OLD_NEAR(, name, ret_type)
+#define __OLD_NEAR1(name, ret_type) __P_OLD_NEAR1(, name, ret_type)
+#endif
+
__OLD_NEAR(snd_pcm_hw_params_set_channels_near, unsigned int);
__OLD_NEAR1(snd_pcm_hw_params_set_rate_near, unsigned int);
__OLD_NEAR1(snd_pcm_hw_params_set_period_time_near, unsigned int);
@@ -6246,8 +6268,8 @@
__OLD_NEAR(snd_pcm_hw_params_set_buffer_size_near, snd_pcm_uframes_t);
__OLD_NEAR1(snd_pcm_hw_params_set_tick_time_near, unsigned int);
-#define __OLD_SET_FL(name, ret_type) \
-ret_type __old_##name(snd_pcm_t *pcm, snd_pcm_hw_params_t *params) \
+#define __P_OLD_SET_FL(pfx, name, ret_type) \
+ret_type pfx##name(snd_pcm_t *pcm, snd_pcm_hw_params_t *params) \
{ \
ret_type val; \
if (INTERNAL(name)(pcm, params, &val) < 0) \
@@ -6255,8 +6277,8 @@
return (ret_type)val; \
}
-#define __OLD_SET_FL1(name, ret_type) \
-ret_type __old_##name(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, int *dir) \
+#define __P_OLD_SET_FL1(pfx, name, ret_type) \
+ret_type pfx##name(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, int *dir) \
{ \
ret_type val; \
if (INTERNAL(name)(pcm, params, &val, dir) < 0) \
@@ -6264,6 +6286,14 @@
return (ret_type)val; \
}
+#ifdef USE_VERSIONED_SYMBOLS
+#define __OLD_SET_FL(name, ret_type) __P_OLD_SET_FL(__old_, name, ret_type)
+#define __OLD_SET_FL1(name, ret_type) __P_OLD_SET_FL1(__old_, name, ret_type)
+#else
+#define __OLD_SET_FL(name, ret_type) __P_OLD_SET_FL(, name, ret_type)
+#define __OLD_SET_FL1(name, ret_type) __P_OLD_SET_FL1(, name, ret_type)
+#endif
+
__OLD_SET_FL(snd_pcm_hw_params_set_access_first, snd_pcm_access_t);
__OLD_SET_FL(snd_pcm_hw_params_set_format_first, snd_pcm_format_t);
__OLD_SET_FL(snd_pcm_hw_params_set_subformat_first, snd_pcm_subformat_t);
@@ -6355,7 +6385,5 @@
OBSOLETE1(snd_pcm_hw_params_set_tick_time_near, ALSA_0.9, ALSA_0.9.0rc4);
OBSOLETE1(snd_pcm_hw_params_set_tick_time_first, ALSA_0.9, ALSA_0.9.0rc4);
OBSOLETE1(snd_pcm_hw_params_set_tick_time_last, ALSA_0.9, ALSA_0.9.0rc4);
-
-#endif /* USE_VERSIONED_SYMBOLS */
#endif /* DOC_HIDDEN */
Index: pcm_local.h
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_local.h,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- pcm_local.h 9 Oct 2002 06:44:45 -0000 1.114
+++ pcm_local.h 10 Oct 2002 11:01:20 -0000 1.115
@@ -636,9 +636,9 @@
int snd_pcm_hw_params_set_periods_min(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
unsigned int *val, int *dir);
int snd_pcm_hw_params_set_periods_max(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
unsigned int *val, int *dir);
int snd_pcm_hw_params_set_periods_minmax(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
unsigned int *min, int *mindir, unsigned int *max, int *maxdir);
-int snd_pcm_hw_params_set_periods_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
unsigned int *val, int *dir);
-int snd_pcm_hw_params_set_periods_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
unsigned int *val, int *dir);
-int snd_pcm_hw_params_set_periods_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
unsigned int *val, int *dir);
+int INTERNAL(snd_pcm_hw_params_set_periods_near)(snd_pcm_t *pcm, snd_pcm_hw_params_t
+*params, unsigned int *val, int *dir);
+int INTERNAL(snd_pcm_hw_params_set_periods_first)(snd_pcm_t *pcm, snd_pcm_hw_params_t
+*params, unsigned int *val, int *dir);
+int INTERNAL(snd_pcm_hw_params_set_periods_last)(snd_pcm_t *pcm, snd_pcm_hw_params_t
+*params, unsigned int *val, int *dir);
int snd_pcm_hw_params_set_periods_integer(snd_pcm_t *pcm, snd_pcm_hw_params_t
*params);
int INTERNAL(snd_pcm_hw_params_get_buffer_time)(const snd_pcm_hw_params_t *params,
unsigned int *val, int *dir);
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
