switch_config isn't used anymore. leaving the .c and .h file there for now, we may...

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

diff --git a/Makefile.am b/Makefile.am
index 44709021c8a4bd7df1ed159d19addcb9539cc763..c439726399b33fe1dc47ac3e4b62183ebef7464a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,6 @@ src/switch_apr.c \
 src/switch_buffer.c \
 src/switch_caller.c \
 src/switch_channel.c \
-src/switch_config.c \
 src/switch_console.c \
 src/switch_core.c \
 src/switch_core_db.c\
@@ -52,7 +51,6 @@ src/include/switch_apr.h\
 src/include/switch_buffer.h\
 src/include/switch_caller.h\
 src/include/switch_channel.h\
-src/include/switch_config.h\
 src/include/switch_console.h\
 src/include/switch_core.h\
 src/include/switch_core_db.h\

diff --git a/src/include/switch.h b/src/include/switch.h
index 201e5c815b4ff9a13a2ea47abe1afba52403302b..2e1474b3fbd92a44275583a42ca165d7470a4979 100644 (file)
--- a/src/include/switch.h
+++ b/src/include/switch.h
@@ -79,7 +79,6 @@
 #include <switch_console.h>
 #include <switch_utils.h>
 #include <switch_caller.h>
-#include <switch_config.h>
 #include <switch_frame.h>
 #include <switch_module_interfaces.h>
 #include <switch_channel.h>

diff --git a/src/include/switch_config.h b/src/include/switch_config.h
index 93d5fe379d1e3e34f1c33ec34de138e8587f3597..bb4fddd214e539418914af077c68e287f6013723 100644 (file)
--- a/src/include/switch_config.h
+++ b/src/include/switch_config.h
@@ -60,6 +60,8 @@
 
 SWITCH_BEGIN_EXTERN_C
 
+typedef struct switch_config switch_config_t;
+
 /*! \brief A simple file handle representing an open configuration file **/
 struct switch_config {
        /*! FILE stream buffer to the opened file */

diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index f7e3b0816a9166db8f14be45aa59fc54d6fee7c0..2bde414694208c0ddf4e2d55ab7c96968aa33d66 100644 (file)
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -969,7 +969,6 @@ typedef struct switch_core_thread_session switch_core_thread_session_t;
 typedef struct switch_codec_implementation switch_codec_implementation_t;
 typedef struct switch_buffer switch_buffer_t;
 typedef struct switch_codec_settings switch_codec_settings_t;
-typedef struct switch_config switch_config_t;
 
 typedef struct switch_io_event_hook_outgoing_channel switch_io_event_hook_outgoing_channel_t;
 typedef struct switch_io_event_hook_answer_channel switch_io_event_hook_answer_channel_t;

diff --git a/w32/Library/FreeSwitchCore.vcproj b/w32/Library/FreeSwitchCore.vcproj
index 6c1ebff6002e653d033d2972991ceb2190d150d8..d45c4c084dc222799a4b0c1b5b9f3df940e046a1 100644 (file)
--- a/w32/Library/FreeSwitchCore.vcproj
+++ b/w32/Library/FreeSwitchCore.vcproj
@@ -239,10 +239,6 @@
                                RelativePath="..\..\src\switch_channel.c"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\src\switch_config.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\src\switch_console.c"\r
                                >\r
@@ -321,10 +317,6 @@
                                RelativePath="..\..\src\include\switch_channel.h"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\switch_config.h"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\src\include\switch_console.h"\r
                                >\r