diff --git a/libs/spandsp/src/Makefile.am b/libs/spandsp/src/Makefile.am index 0f56650fe0..250b21785f 100644 --- a/libs/spandsp/src/Makefile.am +++ b/libs/spandsp/src/Makefile.am @@ -467,12 +467,12 @@ $(VCPROJ9): msvc/vc9proj.head msvc/vc9proj.foot Makefile.am $(srcdir)/msvc/spandsp.h: spandsp.h.in echo "creating $(srcdir)/msvc/spandsp.h" - @cp $(srcdir)/spandsp.h.in $(srcdir)/msvc/spandsp.h - @sed -i -e "s/\@SPANDSP_USE_FIXED_POINT\@/#undef SPANDSP_USE_FIXED_POINT/" $(srcdir)/msvc/spandsp.h - @sed -i -e "s/\@SPANDSP_MISALIGNED_ACCESS_FAILS\@/#undef SPANDSP_MISALIGNED_ACCESS_FAILS/" $(srcdir)/msvc/spandsp.h - @sed -i -e "s/\@SPANDSP_USE_EXPORT_CAPABILITY\@/#define SPANDSP_USE_EXPORT_CAPABILITY 1/" $(srcdir)/msvc/spandsp.h - @sed -i -e "s/\@INSERT_INTTYPES_HEADER\@/#include /" $(srcdir)/msvc/spandsp.h - @sed -i -e "s/\@INSERT_MATH_HEADER\@/#include /" $(srcdir)/msvc/spandsp.h + @sed -e "s/#define _SPANDSP_H_/#define _SPANDSP_H_\n\n#define __inline__ __inline\n#pragma warning(disable:4200)/" \ + -e "s/\@SPANDSP_USE_FIXED_POINT\@/#undef SPANDSP_USE_FIXED_POINT/" \ + -e "s/\@SPANDSP_MISALIGNED_ACCESS_FAILS\@/#undef SPANDSP_MISALIGNED_ACCESS_FAILS/" \ + -e "s/\@SPANDSP_USE_EXPORT_CAPABILITY\@/#define SPANDSP_USE_EXPORT_CAPABILITY 1/" \ + -e "s/\@INSERT_INTTYPES_HEADER\@/#include /" \ + -e "s/\@INSERT_MATH_HEADER\@/#include /" $(srcdir)/spandsp.h.in > $(srcdir)/msvc/spandsp.h spandsp/version.h: NOWDATE=`date --utc +"%Y%m%d"` ; \ diff --git a/libs/spandsp/src/libspandsp.2005.sln b/libs/spandsp/src/libspandsp.2005.sln index d7bbaa4341..3db2440e4d 100644 --- a/libs/spandsp/src/libspandsp.2005.sln +++ b/libs/spandsp/src/libspandsp.2005.sln @@ -29,10 +29,12 @@ Global {DEE932AB-5911-4700-9EEB-8C7090A0A330}.All|Win32.ActiveCfg = All|Win32 {DEE932AB-5911-4700-9EEB-8C7090A0A330}.All|Win32.Build.0 = All|Win32 {DEE932AB-5911-4700-9EEB-8C7090A0A330}.Debug|Win32.ActiveCfg = All|Win32 + {DEE932AB-5911-4700-9EEB-8C7090A0A330}.Debug|Win32.Build.0 = All|Win32 {DEE932AB-5911-4700-9EEB-8C7090A0A330}.Release|Win32.ActiveCfg = All|Win32 {329A6FA0-0FCC-4435-A950-E670AEFA9838}.All|Win32.ActiveCfg = All|Win32 {329A6FA0-0FCC-4435-A950-E670AEFA9838}.All|Win32.Build.0 = All|Win32 {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Debug|Win32.ActiveCfg = All|Win32 + {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Debug|Win32.Build.0 = All|Win32 {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|Win32.ActiveCfg = All|Win32 {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.All|Win32.ActiveCfg = Release|Win32 {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.All|Win32.Build.0 = Release|Win32 diff --git a/libs/spandsp/src/libspandsp.2008.vcproj b/libs/spandsp/src/libspandsp.2008.vcproj index 2973010206..b9d36342c3 100644 --- a/libs/spandsp/src/libspandsp.2008.vcproj +++ b/libs/spandsp/src/libspandsp.2008.vcproj @@ -98,83 +98,6 @@ Name="VCPostBuildEventTool" /> - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - + + + + + + + diff --git a/libs/spandsp/src/libtiff.2005.vcproj b/libs/spandsp/src/libtiff.2005.vcproj index f30239332d..62a5f776a4 100644 --- a/libs/spandsp/src/libtiff.2005.vcproj +++ b/libs/spandsp/src/libtiff.2005.vcproj @@ -346,12 +346,6 @@ > - - diff --git a/libs/spandsp/src/libtiff.2008.vcproj b/libs/spandsp/src/libtiff.2008.vcproj index 5190b35023..48168d6965 100644 --- a/libs/spandsp/src/libtiff.2008.vcproj +++ b/libs/spandsp/src/libtiff.2008.vcproj @@ -477,12 +477,6 @@ > - - diff --git a/libs/spandsp/src/msvc/config.h b/libs/spandsp/src/msvc/config.h index a69e2acc18..ff82b907a7 100644 --- a/libs/spandsp/src/msvc/config.h +++ b/libs/spandsp/src/msvc/config.h @@ -37,12 +37,51 @@ #define SPANDSP_USE_EXPORT_CAPABILITY 1 -#ifdef __cplusplus -extern "C" { -#endif -#ifdef __cplusplus -} -#endif +#define PACKAGE "spandsp" +#define VERSION "0.0.6" + + + +// Win32/DevStudio compatibility stuff + +#ifdef _MSC_VER + + #if (_MSC_VER >= 1400) // VC8+ + #ifndef _CRT_SECURE_NO_DEPRECATE + #define _CRT_SECURE_NO_DEPRECATE + #endif + #ifndef _CRT_NONSTDC_NO_DEPRECATE + #define _CRT_NONSTDC_NO_DEPRECATE + #endif + #ifndef _CRT_SECURE_NO_WARNINGS + #define _CRT_SECURE_NO_WARNINGS + #endif + #endif // VC8+ + + // disable the following warnings + #pragma warning(disable:4100) // The formal parameter is not referenced in the body of the function. The unreferenced parameter is ignored. + #pragma warning(disable:4200) // Non standard extension C zero sized array + #pragma warning(disable:4706) // assignment within conditional expression + #pragma warning(disable:4244) // conversion from 'type1' to 'type2', possible loss of data + #pragma warning(disable:4295) // array is too small to include a terminating null character + #pragma warning(disable:4125) // decimal digit terminates octal escape sequence + #pragma warning(disable:4305) // 'function' : truncation from 'double' to 'float' + #pragma warning(disable:4018) // '<' : signed/unsigned mismatch + #pragma warning(disable:4389) // '==' : signed/unsigned mismatch + #pragma warning(disable:4245) // 'return' : conversion from 'int' to 'size_t', signed/unsigned mismatch + + #define strncasecmp _strnicmp + #define strcasecmp _stricmp + #define snprintf _snprintf + #define inline __inline + #define __inline__ __inline + + #define _MMX_H_ + + #include // To get alloca + +#endif + #endif diff --git a/libs/spandsp/src/msvc/inttypes.h b/libs/spandsp/src/msvc/inttypes.h index cc5981ee0f..a39d60948b 100644 --- a/libs/spandsp/src/msvc/inttypes.h +++ b/libs/spandsp/src/msvc/inttypes.h @@ -19,16 +19,7 @@ extern "C" { #endif -#ifdef _MSC_VER -#if (_MSC_VER >= 1400) // VC8+ -#ifndef _CRT_SECURE_NO_DEPRECATE -#define _CRT_SECURE_NO_DEPRECATE -#endif -#ifndef _CRT_NONSTDC_NO_DEPRECATE -#define _CRT_NONSTDC_NO_DEPRECATE -#endif -#endif // VC8+ -#include + typedef unsigned __int8 uint8_t; typedef unsigned __int16 uint16_t; typedef unsigned __int32 uint32_t; @@ -37,41 +28,12 @@ typedef __int8 int8_t; typedef __int16 int16_t; typedef __int32 int32_t; typedef __int64 int64_t; -#define inline __inline -#define __inline__ __inline #define INT16_MAX 0x7fff #define INT16_MIN (-INT16_MAX - 1) -#define _MMX_H_ - -/* disable the following warnings - * C4100: The formal parameter is not referenced in the body of the function. The unreferenced parameter is ignored. - * C4200: Non standard extension C zero sized array - * C4706: assignment within conditional expression - * C4244: conversion from 'type1' to 'type2', possible loss of data - * C4295: array is too small to include a terminating null character - * C4125: decimal digit terminates octal escape sequence - */ -#pragma warning(disable:4100 4200 4706 4295 4125) - -#pragma comment(lib, "ws2_32.lib") - -#ifndef strncasecmp -#define strncasecmp _strnicmp -#endif -#ifndef strcasecmp -#define strcasecmp _stricmp -#endif -#ifndef snprintf -#define snprintf _snprintf -#endif #if !defined(INFINITY) #define INFINITY 0x7fffffff #endif -#endif - -#define PACKAGE "spandsp" -#define VERSION "0.0.3andabit" #define INT32_MAX (2147483647) #define INT32_MIN (-2147483647 - 1) diff --git a/libs/spandsp/src/msvc/spandsp.def b/libs/spandsp/src/msvc/spandsp.def deleted file mode 100644 index 3f9b5a04b5..0000000000 --- a/libs/spandsp/src/msvc/spandsp.def +++ /dev/null @@ -1,296 +0,0 @@ -EXPORTS -adsi_rx_init -adsi_rx -adsi_tx_init -adsi_next_field -adsi_add_field -alaw_to_ulaw -async_tx_init -async_rx_init -awgn -bert_init -bert_get_bit -bert_put_bit -bert_set_report -bert_result -filter_create -filter_delete -filter_step -cfilter_create -cfilter_delete -cfilter_step -dds_phase_rate -dds_frequency -dds_scaling_dbm0 -dds_scaling_dbov -dds_lookup -dds_offset -dds -dds_mod -dds_phase_ratef -dds_frequencyf -dds_scaling_dbm0f -dds_scaling_dbovf -ddsf -dds_modf -dds_complexf -dds_complex_modf -echo_can_create -echo_can_free -echo_can_flush -echo_can_adaption_mode -echo_can_update -fax_rx -fax_tx -fax_init -fax_release -fsk_tx_init -fsk_tx_power -fsk_tx_set_get_bit -fsk_tx -fsk_rx_signal_power -fsk_rx_signal_cutoff -fsk_rx_init -fsk_rx -fsk_rx_set_put_bit -g711_init -g711_release -g711_encode -g711_decode -g711_transcode -g722_encode_init -g722_encode_release -g722_encode -g722_decode_init -g722_decode_release -g722_decode -g726_init -g726_release -crc_itu32_calc -crc_itu32_append -crc_itu32_check -crc_itu16_calc -crc_itu16_append -crc_itu16_check -hdlc_rx_init -hdlc_rx_get_stats -hdlc_tx_init -hdlc_tx_frame -ima_adpcm_init -ima_adpcm_release -span_log_test -span_log -span_log_buf -span_log_init -span_log_set_protocol -span_set_message_handler -span_set_error_handler -modem_echo_can_create -modem_echo_can_free -modem_echo_can_flush -modem_echo_can_adaption_mode -modem_echo_can_update -noise -oki_adpcm_init -oki_adpcm_release -playout_put -playout_get -playout_get_unconditional -playout_current_length -playout_next_due -playout_new -playout_free -playout_restart -plc_rx -plc_fillin -plc_init -power_meter_init -power_meter_damping -power_meter_update -power_meter_level_dbm0 -power_meter_level_dbov -queue_empty -queue_free_space -queue_contents -queue_flush -queue_view -queue_read -queue_write -queue_read_msg -queue_write_msg -sig_tone_rx_init -sig_tone_tx_init -sig_tone_rx -sig_tone_tx -super_tone_rx_make_descriptor -super_tone_rx_add_tone -super_tone_rx_add_element -super_tone_rx_init -super_tone_rx_free -super_tone_rx_segment_callback -super_tone_rx -super_tone_tx_make_step -super_tone_tx_free -super_tone_tx_init -super_tone_tx -t30_init -t30_release -t30_restart -t30_free -t30_frametype -t30_decode_dis_dtc_dcs -t30_completion_code_to_str -t30_get_transfer_statistics -t30_set_phase_b_handler -t30_set_phase_d_handler -t30_set_phase_e_handler -t30_set_document_handler -t30_set_rx_file -t30_set_tx_file -t30_local_interrupt_request -t30_hdlc_accept -t30_timer_update -t31_call_event -t31_at_rx -t31_rx -t31_tx -t31_init -t31_release -t35_decode -t38_terminal_init -t38_gateway_init -t4_rx_init -t4_rx_start_page -t4_rx_end_page -t4_rx_delete -t4_rx_end -t4_rx_set_rx_encoding -t4_rx_set_sub_address -t4_rx_set_far_ident -t4_rx_set_vendor -t4_rx_set_model -t4_tx_init -t4_tx_start_page -t4_tx_restart_page -t4_tx_end_page -t4_tx_delete -t4_tx_end -t4_tx_set_tx_encoding -t4_tx_set_min_row_bits -t4_tx_set_local_ident -t4_tx_set_header_info -t4_get_transfer_statistics -t4_encoding_to_str -time_scale_init -time_scale_rate -time_scale -make_goertzel_descriptor -goertzel_init -goertzel_update -goertzel_result -dtmf_rx_init -dtmf_rx_set_realtime_callback -dtmf_rx_parms -dtmf_rx -make_tone_gen_descriptor -tone_gen_init -tone_gen -dtmf_tx_init -dtmf_tx -ulaw_to_alaw -v17_rx_init -v17_rx_restart -v17_rx_set_put_bit -v17_rx -v17_rx_equalizer_state -v17_rx_carrier_frequency -v17_rx_symbol_timing_correction -v17_rx_signal_power -v17_rx_signal_cutoff -v17_rx_set_qam_report_handler -v17_tx_power -v17_tx_init -v17_tx_restart -v17_tx_set_get_bit -v17_tx -v22bis_rx_restart -v22bis_rx -v22bis_rx_carrier_frequency -v22bis_rx_signal_power -v22bis_tx -v22bis_tx_power -v22bis_restart -v22bis_init -v22bis_set_get_bit -v22bis_set_put_bit -v27ter_rx_init -v27ter_rx_restart -v27ter_rx_set_put_bit -v27ter_rx -v27ter_rx_equalizer_state -v27ter_rx_carrier_frequency -v27ter_rx_symbol_timing_correction -v27ter_rx_signal_power -v27ter_rx_signal_cutoff -v27ter_rx_set_qam_report_handler -v27ter_tx_power -v27ter_tx_init -v27ter_tx_restart -v27ter_tx_set_get_bit -v27ter_tx -v29_rx_init -v29_rx_restart -v29_rx_set_put_bit -v29_rx -v29_rx_equalizer_state -v29_rx_carrier_frequency -v29_rx_symbol_timing_correction -v29_rx_signal_power -v29_rx_signal_cutoff -v29_rx_set_qam_report_handler -v29_tx_power -v29_tx_init -v29_tx_restart -v29_tx_set_get_bit -v29_tx -lapm_dump -lapm_receive -lapm_tx -lapm_tx_iframe -v42_set_status_callback -v42_rx_bit -v42_tx_bit -v42_init -v42_restart -v42_release -v42bis_compress -v42bis_compress_flush -v42bis_decompress -v42bis_decompress_flush -v42bis_init -v42bis_release -v8_init -v8_release -v8_tx -v8_rx -v8_log_supported_modulations -t30_set_ecm_capability -t30_set_supported_compressions -t30_set_supported_modems -t30_set_supported_resolutions -t30_set_supported_image_sizes -t30_set_tx_page_header_info -t30_set_tx_ident -span_log_set_level -span_log_set_message_handler -fax_set_transmit_on_idle -fax_get_t30_state -t30_get_rx_model -t30_get_rx_vendor -t30_get_rx_country -t30_get_rx_ident -t30_get_tx_ident -t38_terminal_release -t38_terminal_get_t30_state -t30_terminate - diff --git a/libs/spandsp/src/msvc/spandsp.h b/libs/spandsp/src/msvc/spandsp.h index c46a5257a2..8c2a57245c 100644 --- a/libs/spandsp/src/msvc/spandsp.h +++ b/libs/spandsp/src/msvc/spandsp.h @@ -30,13 +30,17 @@ #if !defined(_SPANDSP_H_) #define _SPANDSP_H_ +#define __inline__ __inline +#pragma warning(disable:4200) + + #undef SPANDSP_USE_FIXED_POINT #undef SPANDSP_MISALIGNED_ACCESS_FAILS #define SPANDSP_USE_EXPORT_CAPABILITY 1 #include -#include +#include #include #include #include diff --git a/libs/spandsp/src/msvc/sys/time.h b/libs/spandsp/src/msvc/sys/time.h index bd3bcb2c7b..5312d9f68c 100644 --- a/libs/spandsp/src/msvc/sys/time.h +++ b/libs/spandsp/src/msvc/sys/time.h @@ -1 +1,20 @@ +/* + * SpanDSP - a series of DSP components for telephony + * + * sys/time.h - a fudge for MSVC, which lacks this header + * + * Written by Steve Underwood + * + * Copyright (C) 2006 Michael Jerris + * + * + * This file is released in the public domain. + * + */ + +struct timeval { + long tv_sec; + long tv_usec; +}; + extern void gettimeofday(struct timeval *tv, void *tz); diff --git a/libs/spandsp/src/msvc/unistd.h b/libs/spandsp/src/msvc/unistd.h index 2d7326c80e..28ab355c09 100644 --- a/libs/spandsp/src/msvc/unistd.h +++ b/libs/spandsp/src/msvc/unistd.h @@ -1,7 +1,7 @@ /* * SpanDSP - a series of DSP components for telephony * - * inttypes.h - a fudge for MSVC, which lacks this header + * unistd.h - a fudge for MSVC, which lacks this header * * Written by Steve Underwood * @@ -19,8 +19,9 @@ extern "C" { #endif -#define open _open -#define write _write +// Declare this so we don't have to include winsock.h, it causes numerous conflicts. +extern int __stdcall gethostname(char * name, int namelen); +#pragma comment(lib, "ws2_32.lib") extern int getopt(int argc, char *argv[], char *opstring); diff --git a/libs/spandsp/src/msvc/vc8proj.foot b/libs/spandsp/src/msvc/vc8proj.foot index 5586886173..26bbb5726f 100644 --- a/libs/spandsp/src/msvc/vc8proj.foot +++ b/libs/spandsp/src/msvc/vc8proj.foot @@ -1,10 +1,28 @@ - - + + + + + + + diff --git a/libs/spandsp/src/msvc/vc9proj.foot b/libs/spandsp/src/msvc/vc9proj.foot index 5586886173..26bbb5726f 100644 --- a/libs/spandsp/src/msvc/vc9proj.foot +++ b/libs/spandsp/src/msvc/vc9proj.foot @@ -1,10 +1,28 @@ - - + + + + + + +