general haphazzard rearrangement

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

src/include/switch_core.h

@@ -892,11 +892,16 @@ SWITCH_DECLARE(switch_status) switch_core_directory_close(switch_directory_handl
 SWITCH_DECLARE(FILE *) switch_core_data_channel(switch_text_channel channel);
 
 /*!
-  \brief Set the output console to the desired FILE stream
-  \param handle the FILE stream
+  \brief Set the output console to the desired file
+  \param console the file path
 */
-SWITCH_DECLARE(void) switch_core_set_console(FILE *handle);
+SWITCH_DECLARE(switch_status) switch_core_set_console(char *console);
 
+/*!
+  \brief Get the output console
+  \return the FILE stream
+*/
+SWITCH_DECLARE(FILE *) switch_core_get_console(void);
 /*! 
   \brief Launch a thread
 */

src/include/switch_types.h

@@ -41,6 +41,42 @@ extern "C" {
 #include <switch.h>
 #include <switch_platform.h>
 
+#ifndef SWITCH_PREFIX_DIR
+#define SWITCH_PREFIX_DIR "."
+#endif
+
+#ifndef SWITCH_MOD_DIR
+#define SWITCH_MODDIR "./mod"
+#endif
+
+#ifndef SWITCH_CONF_DIR
+#define SWITCH_CONF_DIR "./conf"
+#endif
+
+#ifndef SWITCH_LOG_DIR
+#define SWITCH_LOG_DIR "./log"
+#endif
+
+#ifndef SWITCH_DB_DIR
+#define SWITCH_DB_DIR "./db"
+#endif
+
+#ifndef SWITCH_SCRIPT_DIR
+#define SWITCH_SCRIPT_DIR "./scripts"
+#endif
+
+struct switch_directories {
+	char *base_dir;
+	char *mod_dir;
+	char *conf_dir;
+	char *log_dir;
+	char *db_dir;
+	char *script_dir;
+};
+
+typedef struct switch_directories switch_directories;
+extern switch_directories SWITCH_GLOBAL_dirs;
+
 #define SWITCH_RECCOMMENDED_BUFFER_SIZE 131072
 #define SWITCH_MAX_CODECS 30
 #define SWITCH_MAX_STATE_HANDLERS 30