Added missing dependency on header file generator programs in 2005 solution file.

Shuffled where various compatibility items of code are amongst the headers in msvc directory so:

  Not too many warnings are disabled in source file that includes spandsp.h

  A copy of the msvc/spandsp.h file to spandsp/src directory so project that uses it only needs to add one directory to search, or can even just explicitly put the path in for the spandsp.h file.

  Removal of need for windows.h to be implicitly included by user source file via spandsp.h, can cause conflicts.

  Some symbol conflicts with other libraries.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12272 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/spandsp/src/Makefile.am b/libs/spandsp/src/Makefile.am
index 0f56650fe01fe81f7a7b854fbfc42f8f9e09ccf0..250b21785f3343062d86d0f1a3e66eeaaa113c16 100644 (file)
--- 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 <inttypes.h>/" $(srcdir)/msvc/spandsp.h
-       @sed -i -e "s/\@INSERT_MATH_HEADER\@/#include <math.h>/" $(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 <msvc\/inttypes.h>/" \
+            -e "s/\@INSERT_MATH_HEADER\@/#include <math.h>/" $(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 d7bbaa43417b4e07033342f6a10a830adb26d738..3db2440e4d979a61a69a9cf5c1173a5d1f51ac8a 100644 (file)
--- 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\r
                {DEE932AB-5911-4700-9EEB-8C7090A0A330}.All|Win32.Build.0 = All|Win32\r
                {DEE932AB-5911-4700-9EEB-8C7090A0A330}.Debug|Win32.ActiveCfg = All|Win32\r
+               {DEE932AB-5911-4700-9EEB-8C7090A0A330}.Debug|Win32.Build.0 = All|Win32\r
                {DEE932AB-5911-4700-9EEB-8C7090A0A330}.Release|Win32.ActiveCfg = All|Win32\r
                {329A6FA0-0FCC-4435-A950-E670AEFA9838}.All|Win32.ActiveCfg = All|Win32\r
                {329A6FA0-0FCC-4435-A950-E670AEFA9838}.All|Win32.Build.0 = All|Win32\r
                {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Debug|Win32.ActiveCfg = All|Win32\r
+               {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Debug|Win32.Build.0 = All|Win32\r
                {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|Win32.ActiveCfg = All|Win32\r
                {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.All|Win32.ActiveCfg = Release|Win32\r
                {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.All|Win32.Build.0 = Release|Win32\r

diff --git a/libs/spandsp/src/libspandsp.2008.vcproj b/libs/spandsp/src/libspandsp.2008.vcproj
index 2973010206d55d96acc14cc0367e57f482b25539..b9d36342c3c84a5b176a87cf65fa05b5e5fade9e 100644 (file)
--- a/libs/spandsp/src/libspandsp.2008.vcproj
+++ b/libs/spandsp/src/libspandsp.2008.vcproj
@@ -99,11 +99,13 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)Release"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
+                       BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -122,16 +124,13 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               AdditionalIncludeDirectories=".;.\spandsp;.\msvc;&quot;..\..\tiff-3.8.2\libtiff&quot;"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H"\r
+                               RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
+                               ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb"\r
                                WarningLevel="4"\r
                                DebugInformationFormat="3"\r
-                               CompileAs="1"\r
                                DisableSpecificWarnings="4127"\r
                        />\r
                        <Tool\r
@@ -145,13 +144,15 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
-                               ImportLibrary="$(TargetDir)spandsp.lib"\r
-                               TargetMachine="17"\r
+                               ImportLibrary="./Release\spandsp.lib"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -176,13 +177,11 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)Release"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
-                       BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -201,13 +200,16 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories=".;.\spandsp;.\msvc;&quot;..\..\tiff-3.8.2\libtiff&quot;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H"\r
-                               RuntimeLibrary="2"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
-                               ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb"\r
                                WarningLevel="4"\r
                                DebugInformationFormat="3"\r
+                               CompileAs="1"\r
                                DisableSpecificWarnings="4127"\r
                        />\r
                        <Tool\r
@@ -221,15 +223,13 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="1"\r
+                               LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
-                               ImportLibrary="./Release\spandsp.lib"\r
-                               TargetMachine="1"\r
+                               ImportLibrary="$(TargetDir)spandsp.lib"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -1155,12 +1155,30 @@
                                >\r
                        </File>\r
                </Filter>\r
-               <Filter\r
-                       Name="Resource Files"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+               <File\r
+                       RelativePath=".\msvc\spandsp.h"\r
                        >\r
-               </Filter>\r
+                       <FileConfiguration\r
+                               Name="Debug|Win32"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCCustomBuildTool"\r
+                                       Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)"\r
+                                       CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)"\r
+                                       Outputs="$(SolutionDir)$(InputFileName)"\r
+                               />\r
+                       </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Release|Win32"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCCustomBuildTool"\r
+                                       Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)"\r
+                                       CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)"\r
+                                       Outputs="$(SolutionDir)$(InputFileName)"\r
+                               />\r
+                       </FileConfiguration>\r
+               </File>\r
        </Files>\r
        <Globals>\r
        </Globals>\r

diff --git a/libs/spandsp/src/libtiff.2005.vcproj b/libs/spandsp/src/libtiff.2005.vcproj
index f30239332d261bd149533b73ea44cdb57ced2440..62a5f776a48023dd2e0eb800bd0949f71e6adc8a 100644 (file)
--- a/libs/spandsp/src/libtiff.2005.vcproj
+++ b/libs/spandsp/src/libtiff.2005.vcproj
@@ -346,12 +346,6 @@
                                >\r
                        </File>\r
                </Filter>\r
-               <Filter\r
-                       Name="Resource Files"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       >\r
-               </Filter>\r
        </Files>\r
        <Globals>\r
        </Globals>\r

diff --git a/libs/spandsp/src/libtiff.2008.vcproj b/libs/spandsp/src/libtiff.2008.vcproj
index 5190b35023f0d83ef0e590a6bda83972ed5dbb24..48168d6965d63555faa7ba8c1702f8f2100155fc 100644 (file)
--- a/libs/spandsp/src/libtiff.2008.vcproj
+++ b/libs/spandsp/src/libtiff.2008.vcproj
@@ -477,12 +477,6 @@
                                >\r
                        </File>\r
                </Filter>\r
-               <Filter\r
-                       Name="Resource Files"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       >\r
-               </Filter>\r
        </Files>\r
        <Globals>\r
        </Globals>\r

diff --git a/libs/spandsp/src/msvc/config.h b/libs/spandsp/src/msvc/config.h
index a69e2acc181224ddb88682ade90dfb21111039eb..ff82b907a7e7bfb9254647b847158cdd06c5dfc7 100644 (file)
--- 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
-}
+#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 <malloc.h> // To get alloca
+
 #endif
 
+
 #endif

diff --git a/libs/spandsp/src/msvc/inttypes.h b/libs/spandsp/src/msvc/inttypes.h
index cc5981ee0fbc43359e6dcdee53e1601d58e43cbe..a39d60948b916ccfff9455961ae7bea3134dca4d 100644 (file)
--- 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 <windows.h>
+
 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 (file)
index 3f9b5a0..0000000
--- 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\r
-t30_set_supported_compressions\r
-t30_set_supported_modems\r
-t30_set_supported_resolutions\r
-t30_set_supported_image_sizes\r
-t30_set_tx_page_header_info\r
-t30_set_tx_ident\r
-span_log_set_level\r
-span_log_set_message_handler\r
-fax_set_transmit_on_idle\r
-fax_get_t30_state\r
-t30_get_rx_model\r
-t30_get_rx_vendor\r
-t30_get_rx_country\r
-t30_get_rx_ident\r
-t30_get_tx_ident\r
-t38_terminal_release\r
-t38_terminal_get_t30_state\r
-t30_terminate\r
-

diff --git a/libs/spandsp/src/msvc/spandsp.h b/libs/spandsp/src/msvc/spandsp.h
index c46a5257a2bb40c8b2b211a4789296a245d9f6fd..8c2a57245cce9d25ab3f83ef985041cc7efa3444 100644 (file)
--- 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 <stdlib.h>
-#include <inttypes.h>
+#include <msvc\inttypes.h>
 #include <string.h>
 #include <limits.h>
 #include <time.h>

diff --git a/libs/spandsp/src/msvc/sys/time.h b/libs/spandsp/src/msvc/sys/time.h
index bd3bcb2c7b21bfc6a61a3c5908bd92d36292f3e6..5312d9f68c873ae49facbfacfe7a6968f506f334 100644 (file)
--- 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 <steveu@coppice.org>
+ *
+ * Copyright (C) 2006 Michael Jerris
+ *
+ *
+ * This file is released in the public domain.
+ *
+ */
+
+struct timeval {\r
+  long tv_sec;\r
+  long tv_usec;\r
+};\r
+
 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 2d7326c80e6855c761dc4ef10e0f802edc72bc75..28ab355c09b4d72aca749b8e3c8b90cfb142de4a 100644 (file)
--- 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 <steveu@coppice.org>
  *
@@ -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 5586886173475c0c3aa2d81ecd5112dec159df8d..26bbb5726f13701a3ec3b36b03f0e6be3b1ca010 100644 (file)
--- a/libs/spandsp/src/msvc/vc8proj.foot
+++ b/libs/spandsp/src/msvc/vc8proj.foot
@@ -1,10 +1,28 @@
                </Filter>\r
-               <Filter\r
-                       Name="Resource Files"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+               <File\r
+                       RelativePath=".\msvc\spandsp.h"\r
                        >\r
-               </Filter>\r
+                       <FileConfiguration\r
+                               Name="Debug|Win32"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCCustomBuildTool"\r
+                                       Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)"\r
+                                       CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)"\r
+                                       Outputs="$(SolutionDir)$(InputFileName)"\r
+                               />\r
+                       </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Release|Win32"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCCustomBuildTool"\r
+                                       Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)"\r
+                                       CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)"\r
+                                       Outputs="$(SolutionDir)$(InputFileName)"\r
+                               />\r
+                       </FileConfiguration>\r
+               </File>\r
        </Files>\r
        <Globals>\r
        </Globals>\r

diff --git a/libs/spandsp/src/msvc/vc9proj.foot b/libs/spandsp/src/msvc/vc9proj.foot
index 5586886173475c0c3aa2d81ecd5112dec159df8d..26bbb5726f13701a3ec3b36b03f0e6be3b1ca010 100644 (file)
--- a/libs/spandsp/src/msvc/vc9proj.foot
+++ b/libs/spandsp/src/msvc/vc9proj.foot
@@ -1,10 +1,28 @@
                </Filter>\r
-               <Filter\r
-                       Name="Resource Files"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+               <File\r
+                       RelativePath=".\msvc\spandsp.h"\r
                        >\r
-               </Filter>\r
+                       <FileConfiguration\r
+                               Name="Debug|Win32"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCCustomBuildTool"\r
+                                       Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)"\r
+                                       CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)"\r
+                                       Outputs="$(SolutionDir)$(InputFileName)"\r
+                               />\r
+                       </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Release|Win32"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCCustomBuildTool"\r
+                                       Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)"\r
+                                       CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)"\r
+                                       Outputs="$(SolutionDir)$(InputFileName)"\r
+                               />\r
+                       </FileConfiguration>\r
+               </File>\r
        </Files>\r
        <Globals>\r
        </Globals>\r