mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-12-16 08:56:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed compilation --with-versioned=no

Browse source
This commit is contained in:
Jaroslav Kysela 2003-03-11 18:51:32 +00:00
parent 915de60abf
commit fea03e9eba
6 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
configure.in
View file

@ -102,6 +102,7 @@ if test "$versioned" = "yes"; then
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi fi
AM_CONDITIONAL(VERSIONED_SYMBOLS, test x$versioned = xyes)
dnl Check for debug... dnl Check for debug...
AC_MSG_CHECKING(for debug) AC_MSG_CHECKING(for debug)

12
include/alsa-symbols.h
View file

@ -34,4 +34,16 @@
#define default_symbol_version(real, name, version) \ #define default_symbol_version(real, name, version) \
__asm__ (".symver " #real "," #name "@@" #version) __asm__ (".symver " #real "," #name "@@" #version)
#ifdef USE_VERSIONED_SYMBOLS
#define use_symbol_version(real, name, version) \
symbol_version(real, name, version)
#define use_default_symbol_version(real, name, version) \
default_symbol_version(real, name, version)
#else
#define use_symbol_version(real, name, version) /* nothing */
#define use_default_symbol_version(real, name, version) \
__asm__ (".weak " #name); \
__asm__ (".set " #name "," #real)
#endif
#endif /* __ALSA_SYMBOLS_H */ #endif /* __ALSA_SYMBOLS_H */

8
src/Makefile.am
View file

@ -2,6 +2,12 @@ SUBDIRS=control mixer pcm rawmidi timer hwdep seq instr compat conf
EXTRA_DIST=Versions EXTRA_DIST=Versions
COMPATNUM=@LIBTOOL_VERSION_INFO@ COMPATNUM=@LIBTOOL_VERSION_INFO@
if VERSIONED_SYMBOLS
VSYMS = -Wl,--version-script=Versions
else
VSYMS =
endif
lib_LTLIBRARIES = libasound.la lib_LTLIBRARIES = libasound.la
libasound_la_SOURCES = conf.c confmisc.c input.c output.c async.c error.c dlmisc.c libasound_la_SOURCES = conf.c confmisc.c input.c output.c async.c error.c dlmisc.c
libasound_la_LIBADD = control/libcontrol.la mixer/libmixer.la pcm/libpcm.la \ libasound_la_LIBADD = control/libcontrol.la mixer/libmixer.la pcm/libpcm.la \
@ -10,7 +16,7 @@ libasound_la_LIBADD = control/libcontrol.la mixer/libmixer.la pcm/libpcm.la \
compat/libcompat.la -lm -ldl -lpthread compat/libcompat.la -lm -ldl -lpthread
libasound_la_LDFLAGS = -version-info $(COMPATNUM) libasound_la_LDFLAGS = -version-info $(COMPATNUM)
LDFLAGS = -Wl,--version-script=Versions LDFLAGS = $(VSYMS)
control/libcontrol.la: control/libcontrol.la:
$(MAKE) -C control libcontrol.la $(MAKE) -C control libcontrol.la

8
src/pcm/pcm.c
View file

@ -1022,7 +1022,7 @@ snd_pcm_sframes_t snd_pcm_forward(snd_pcm_t *pcm, snd_pcm_uframes_t frames)
assert(frames > 0); assert(frames > 0);
return pcm->fast_ops->forward(pcm->fast_op_arg, frames); return pcm->fast_ops->forward(pcm->fast_op_arg, frames);
} }
default_symbol_version(__snd_pcm_forward, snd_pcm_forward, ALSA_0.9.0rc8); use_default_symbol_version(__snd_pcm_forward, snd_pcm_forward, ALSA_0.9.0rc8);
/** /**
* \brief Write interleaved frames to a PCM * \brief Write interleaved frames to a PCM
@ -1555,7 +1555,7 @@ const char *snd_pcm_type_name(snd_pcm_type_t type)
return NULL; return NULL;
return snd_pcm_type_names[type]; return snd_pcm_type_names[type];
} }
default_symbol_version(__snd_pcm_type_name, snd_pcm_type_name, ALSA_0.9.0); use_default_symbol_version(__snd_pcm_type_name, snd_pcm_type_name, ALSA_0.9.0);
/** /**
* \brief Dump current hardware setup for PCM * \brief Dump current hardware setup for PCM
@ -5633,7 +5633,7 @@ void snd_pcm_status_get_trigger_htstamp(const snd_pcm_status_t *obj, snd_htimest
assert(obj && ptr); assert(obj && ptr);
*ptr = obj->trigger_tstamp; *ptr = obj->trigger_tstamp;
} }
default_symbol_version(__snd_pcm_status_get_trigger_htstamp, snd_pcm_status_get_trigger_htstamp, ALSA_0.9.0rc8); use_default_symbol_version(__snd_pcm_status_get_trigger_htstamp, snd_pcm_status_get_trigger_htstamp, ALSA_0.9.0rc8);
/** /**
* \brief Get "now" timestamp from a PCM status container * \brief Get "now" timestamp from a PCM status container
@ -5659,7 +5659,7 @@ void snd_pcm_status_get_htstamp(const snd_pcm_status_t *obj, snd_htimestamp_t *p
assert(obj && ptr); assert(obj && ptr);
*ptr = obj->tstamp; *ptr = obj->tstamp;
} }
default_symbol_version(__snd_pcm_status_get_htstamp, snd_pcm_status_get_htstamp, ALSA_0.9.0rc8); use_default_symbol_version(__snd_pcm_status_get_htstamp, snd_pcm_status_get_htstamp, ALSA_0.9.0rc8);
/** /**
* \brief Get delay from a PCM status container (see #snd_pcm_delay) * \brief Get delay from a PCM status container (see #snd_pcm_delay)

8
src/timer/timer.c
View file

@ -581,7 +581,7 @@ void snd_timer_params_set_exclusive(snd_timer_params_t * params, int exclusive)
else else
params->flags &= ~SNDRV_TIMER_PSFLG_EXCLUSIVE; params->flags &= ~SNDRV_TIMER_PSFLG_EXCLUSIVE;
} }
default_symbol_version(__snd_timer_params_set_exclusive, snd_timer_params_set_exclusive, ALSA_0.9.0); use_default_symbol_version(__snd_timer_params_set_exclusive, snd_timer_params_set_exclusive, ALSA_0.9.0);
/** /**
* \brief determine if timer has exclusive flag * \brief determine if timer has exclusive flag
@ -597,7 +597,7 @@ int snd_timer_params_get_exclusive(snd_timer_params_t * params)
assert(params); assert(params);
return params->flags & SNDRV_TIMER_PSFLG_EXCLUSIVE ? 1 : 0; return params->flags & SNDRV_TIMER_PSFLG_EXCLUSIVE ? 1 : 0;
} }
default_symbol_version(__snd_timer_params_get_exclusive, snd_timer_params_get_exclusive, ALSA_0.9.0); use_default_symbol_version(__snd_timer_params_get_exclusive, snd_timer_params_get_exclusive, ALSA_0.9.0);
/** /**
* \brief set timer ticks * \brief set timer ticks
@ -654,7 +654,7 @@ void snd_timer_params_set_filter(snd_timer_params_t * params, unsigned int filte
assert(params); assert(params);
params->filter = filter; params->filter = filter;
} }
default_symbol_version(__snd_timer_params_set_filter, snd_timer_params_set_filter, ALSA_0.9.0); use_default_symbol_version(__snd_timer_params_set_filter, snd_timer_params_set_filter, ALSA_0.9.0);
/** /**
* \brief get timer event filter * \brief get timer event filter
@ -670,7 +670,7 @@ unsigned int snd_timer_params_get_filter(snd_timer_params_t * params)
assert(params); assert(params);
return params->filter; return params->filter;
} }
default_symbol_version(__snd_timer_params_get_filter, snd_timer_params_get_filter, ALSA_0.9.0); use_default_symbol_version(__snd_timer_params_get_filter, snd_timer_params_get_filter, ALSA_0.9.0);
/** /**
* \brief set parameters for timer handle * \brief set parameters for timer handle

6
src/timer/timer_query.c
View file

@ -236,7 +236,7 @@ int snd_timer_query_info(snd_timer_query_t *timer, snd_timer_ginfo_t *info)
assert(info); assert(info);
return timer->ops->info(timer, info); return timer->ops->info(timer, info);
} }
default_symbol_version(__snd_timer_query_info, snd_timer_query_info, ALSA_0.9.0); use_default_symbol_version(__snd_timer_query_info, snd_timer_query_info, ALSA_0.9.0);
/** /**
* \brief set the timer global parameters * \brief set the timer global parameters
@ -254,7 +254,7 @@ int snd_timer_query_params(snd_timer_query_t *timer, snd_timer_gparams_t *params
assert(params); assert(params);
return timer->ops->params(timer, params); return timer->ops->params(timer, params);
} }
default_symbol_version(__snd_timer_query_params, snd_timer_query_params, ALSA_0.9.0); use_default_symbol_version(__snd_timer_query_params, snd_timer_query_params, ALSA_0.9.0);
/** /**
* \brief get the timer global status * \brief get the timer global status
@ -272,7 +272,7 @@ int snd_timer_query_status(snd_timer_query_t *timer, snd_timer_gstatus_t *status
assert(status); assert(status);
return timer->ops->status(timer, status); return timer->ops->status(timer, status);
} }
default_symbol_version(__snd_timer_query_status, snd_timer_query_status, ALSA_0.9.0); use_default_symbol_version(__snd_timer_query_status, snd_timer_query_status, ALSA_0.9.0);
/** /**
* \brief get size of the snd_timer_id_t structure in bytes * \brief get size of the snd_timer_id_t structure in bytes