re-factor, cleanup ODBC ifdefs, whitespace and comment cleanup.

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

src/include/switch_odbc.h

@@ -54,7 +54,6 @@ typedef enum {
 	SWITCH_ODBC_STATE_CONNECTED,
 	SWITCH_ODBC_STATE_ERROR
 } switch_odbc_state_t;
-typedef struct switch_odbc_handle switch_odbc_handle_t;
 
 typedef enum {
 	SWITCH_ODBC_SUCCESS = 0,

src/include/switch_types.h

@@ -1047,7 +1047,7 @@ 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_odbc_handle switch_odbc_handle_t;
 
 typedef struct switch_io_routines switch_io_routines_t;
 typedef struct switch_speech_handle switch_speech_handle_t;

src/mod/endpoints/mod_sofia/mod_sofia.h

@@ -254,17 +254,10 @@ struct sofia_profile {
 	uint32_t session_timeout;
 	uint32_t max_proceeding;
 	uint32_t rtp_timeout_sec;
-#ifdef SWITCH_HAVE_ODBC
 	char *odbc_dsn;
 	char *odbc_user;
 	char *odbc_pass;
 	switch_odbc_handle_t *master_odbc;
-#else
-	void *filler1;
-	void *filler2;
-	void *filler3;
-	void *filler4;
-#endif
 };
 
 struct private_object {