Author: mikej Date: Tue Jun 2 09:42:16 2009 New Revision: 13545 Log: use __cdecl calling convention for callback functions Modified: freeswitch/trunk/libs/spandsp/src/fsk.c freeswitch/trunk/libs/spandsp/src/hdlc.c freeswitch/trunk/libs/spandsp/src/modem_connect_tones.c freeswitch/trunk/libs/spandsp/src/spandsp/fsk.h freeswitch/trunk/libs/spandsp/src/spandsp/hdlc.h freeswitch/trunk/libs/spandsp/src/spandsp/modem_connect_tones.h freeswitch/trunk/libs/spandsp/src/spandsp/tone_generate.h freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_tx.h freeswitch/trunk/libs/spandsp/src/spandsp/v29tx.h freeswitch/trunk/libs/spandsp/src/tone_generate.c freeswitch/trunk/libs/spandsp/src/v27ter_tx.c freeswitch/trunk/libs/spandsp/src/v29tx.c Modified: freeswitch/trunk/libs/spandsp/src/fsk.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/fsk.c (original) +++ freeswitch/trunk/libs/spandsp/src/fsk.c Tue Jun 2 09:42:16 2009 @@ -169,7 +169,7 @@ } /*- End of function --------------------------------------------------------*/ -SPAN_DECLARE(int) fsk_tx(fsk_tx_state_t *s, int16_t amp[], int len) +SPAN_DECLARE_NONSTD(int) fsk_tx(fsk_tx_state_t *s, int16_t amp[], int len) { int sample; int bit; Modified: freeswitch/trunk/libs/spandsp/src/hdlc.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/hdlc.c (original) +++ freeswitch/trunk/libs/spandsp/src/hdlc.c Tue Jun 2 09:42:16 2009 @@ -252,7 +252,7 @@ } /*- End of function --------------------------------------------------------*/ -SPAN_DECLARE(void) hdlc_rx_put_bit(hdlc_rx_state_t *s, int new_bit) +SPAN_DECLARE_NONSTD(void) hdlc_rx_put_bit(hdlc_rx_state_t *s, int new_bit) { if (new_bit < 0) { @@ -545,7 +545,7 @@ } /*- End of function --------------------------------------------------------*/ -SPAN_DECLARE(int) hdlc_tx_get_bit(hdlc_tx_state_t *s) +SPAN_DECLARE_NONSTD(int) hdlc_tx_get_bit(hdlc_tx_state_t *s) { int txbit; Modified: freeswitch/trunk/libs/spandsp/src/modem_connect_tones.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/modem_connect_tones.c (original) +++ freeswitch/trunk/libs/spandsp/src/modem_connect_tones.c Tue Jun 2 09:42:16 2009 @@ -87,7 +87,7 @@ } /*- End of function --------------------------------------------------------*/ -SPAN_DECLARE(int) modem_connect_tones_tx(modem_connect_tones_tx_state_t *s, +SPAN_DECLARE_NONSTD(int) modem_connect_tones_tx(modem_connect_tones_tx_state_t *s, int16_t amp[], int len) { Modified: freeswitch/trunk/libs/spandsp/src/spandsp/fsk.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/fsk.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/fsk.h Tue Jun 2 09:42:16 2009 @@ -175,7 +175,7 @@ \param len The number of samples to be generated. \return The number of samples actually generated. */ -SPAN_DECLARE(int) fsk_tx(fsk_tx_state_t *s, int16_t amp[], int len); +SPAN_DECLARE_NONSTD(int) fsk_tx(fsk_tx_state_t *s, int16_t amp[], int len); /*! Get the current received signal power. \param s The modem context. Modified: freeswitch/trunk/libs/spandsp/src/spandsp/hdlc.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/hdlc.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/hdlc.h Tue Jun 2 09:42:16 2009 @@ -154,7 +154,7 @@ \param s A pointer to an HDLC receiver context. \param new_bit The bit. */ -SPAN_DECLARE(void) hdlc_rx_put_bit(hdlc_rx_state_t *s, int new_bit); +SPAN_DECLARE_NONSTD(void) hdlc_rx_put_bit(hdlc_rx_state_t *s, int new_bit); /*! \brief Put a byte of data to an HDLC receiver. \param s A pointer to an HDLC receiver context. @@ -228,7 +228,7 @@ \param s A pointer to an HDLC transmitter context. \return The next bit for transmission. */ -SPAN_DECLARE(int) hdlc_tx_get_bit(hdlc_tx_state_t *s); +SPAN_DECLARE_NONSTD(int) hdlc_tx_get_bit(hdlc_tx_state_t *s); /*! \brief Get the next byte for transmission. \param s A pointer to an HDLC transmitter context. Modified: freeswitch/trunk/libs/spandsp/src/spandsp/modem_connect_tones.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/modem_connect_tones.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/modem_connect_tones.h Tue Jun 2 09:42:16 2009 @@ -125,7 +125,7 @@ \param len The number of samples to generate. \return The number of samples generated. */ -SPAN_DECLARE(int) modem_connect_tones_tx(modem_connect_tones_tx_state_t *s, +SPAN_DECLARE_NONSTD(int) modem_connect_tones_tx(modem_connect_tones_tx_state_t *s, int16_t amp[], int len); Modified: freeswitch/trunk/libs/spandsp/src/spandsp/tone_generate.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/tone_generate.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/tone_generate.h Tue Jun 2 09:42:16 2009 @@ -88,7 +88,7 @@ int d4, int repeat); -SPAN_DECLARE(int) tone_gen(tone_gen_state_t *s, int16_t amp[], int max_samples); +SPAN_DECLARE_NONSTD(int) tone_gen(tone_gen_state_t *s, int16_t amp[], int max_samples); SPAN_DECLARE(tone_gen_state_t *) tone_gen_init(tone_gen_state_t *s, tone_gen_descriptor_t *t); Modified: freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_tx.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_tx.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_tx.h Tue Jun 2 09:42:16 2009 @@ -141,7 +141,7 @@ \param len The number of samples to be generated. \return The number of samples actually generated. */ -SPAN_DECLARE(int) v27ter_tx(v27ter_tx_state_t *s, int16_t amp[], int len); +SPAN_DECLARE_NONSTD(int) v27ter_tx(v27ter_tx_state_t *s, int16_t amp[], int len); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/v29tx.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/v29tx.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/v29tx.h Tue Jun 2 09:42:16 2009 @@ -172,7 +172,7 @@ \param len The number of samples to be generated. \return The number of samples actually generated. */ -SPAN_DECLARE(int) v29_tx(v29_tx_state_t *s, int16_t amp[], int len); +SPAN_DECLARE_NONSTD(int) v29_tx(v29_tx_state_t *s, int16_t amp[], int len); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/tone_generate.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/tone_generate.c (original) +++ freeswitch/trunk/libs/spandsp/src/tone_generate.c Tue Jun 2 09:42:16 2009 @@ -143,7 +143,7 @@ } /*- End of function --------------------------------------------------------*/ -SPAN_DECLARE(int) tone_gen(tone_gen_state_t *s, int16_t amp[], int max_samples) +SPAN_DECLARE_NONSTD(int) tone_gen(tone_gen_state_t *s, int16_t amp[], int max_samples) { int samples; int limit; Modified: freeswitch/trunk/libs/spandsp/src/v27ter_tx.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/v27ter_tx.c (original) +++ freeswitch/trunk/libs/spandsp/src/v27ter_tx.c Tue Jun 2 09:42:16 2009 @@ -244,7 +244,7 @@ } /*- End of function --------------------------------------------------------*/ -SPAN_DECLARE(int) v27ter_tx(v27ter_tx_state_t *s, int16_t amp[], int len) +SPAN_DECLARE_NONSTD(int) v27ter_tx(v27ter_tx_state_t *s, int16_t amp[], int len) { #if defined(SPANDSP_USE_FIXED_POINT) complexi_t x; Modified: freeswitch/trunk/libs/spandsp/src/v29tx.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/v29tx.c (original) +++ freeswitch/trunk/libs/spandsp/src/v29tx.c Tue Jun 2 09:42:16 2009 @@ -202,7 +202,7 @@ } /*- End of function --------------------------------------------------------*/ -SPAN_DECLARE(int) v29_tx(v29_tx_state_t *s, int16_t amp[], int len) +SPAN_DECLARE_NONSTD(int) v29_tx(v29_tx_state_t *s, int16_t amp[], int len) { #if defined(SPANDSP_USE_FIXED_POINT) complexi_t x;