kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-12 20:27:19 +00:00
Code Issues Projects Releases Wiki Activity

a little more header juggling.

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@239 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2005-12-29 19:14:05 +00:00
parent cb53fc6ef5
commit 0fbf3f5af0
5 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/include/switch.h
View File

@ -39,32 +39,9 @@ extern "C" {
#include <config.h> #include <config.h>
#endif #endif
#include <switch_platform.h>
#include <apr.h>
#include <apr_network_io.h>
#include <apr_errno.h>
#include <apr_general.h>
#include <apr_thread_proc.h>
#include <apr_thread_mutex.h>
#include <apr_thread_cond.h>
#include <apr_thread_rwlock.h>
#include <apr_file_io.h>
#include <apr_poll.h>
#include <apr_dso.h>
#include <apr_hash.h>
#include <apr_strings.h>
#include <apr_network_io.h>
#include <apr_poll.h>
#include <apr_queue.h>
#include <apr_uuid.h>
#include <apr_strmatch.h>
#define APR_WANT_STDIO
#define APR_WANT_STRFUNC
#include <apr_want.h>
#include <assert.h> #include <assert.h>
#include <sqlite3.h>
#include <switch_platform.h>
#include <switch_apr.h> #include <switch_apr.h>
#include <switch_sqlite.h> #include <switch_sqlite.h>
#include <switch_types.h> #include <switch_types.h>

22
src/include/switch_apr.h
View File

@ -35,6 +35,28 @@
extern "C" { extern "C" {
#endif #endif
#include <apr.h>
#include <apr_network_io.h>
#include <apr_errno.h>
#include <apr_general.h>
#include <apr_thread_proc.h>
#include <apr_thread_mutex.h>
#include <apr_thread_cond.h>
#include <apr_thread_rwlock.h>
#include <apr_file_io.h>
#include <apr_poll.h>
#include <apr_dso.h>
#include <apr_hash.h>
#include <apr_strings.h>
#include <apr_network_io.h>
#include <apr_poll.h>
#include <apr_queue.h>
#include <apr_uuid.h>
#include <apr_strmatch.h>
#define APR_WANT_STDIO
#define APR_WANT_STRFUNC
#include <apr_want.h>
/* /*
The pieces of apr we allow ppl to pass around between modules we typedef into our namespace and wrap all the functions The pieces of apr we allow ppl to pass around between modules we typedef into our namespace and wrap all the functions
any other apr code should be as hidden as possible. any other apr code should be as hidden as possible.

22
src/include/switch_platform.h
View File

@ -46,25 +46,25 @@ extern "C" {
#ifdef WIN32 #ifdef WIN32
#if defined(SWITCH_CORE_DECLARE_STATIC) #if defined(SWITCH_CORE_DECLARE_STATIC)
#define SWITCH_DECLARE(type) type __stdcall #define SWITCH_DECLARE(type) type __stdcall
#define SWITCH_DECLARE_NONSTD(type) type __cdecl #define SWITCH_DECLARE_NONSTD(type) type __cdecl
#define SWITCH_DECLARE_DATA #define SWITCH_DECLARE_DATA
#elif defined(FREESWITCHCORE_EXPORTS) #elif defined(FREESWITCHCORE_EXPORTS)
#define SWITCH_DECLARE(type) __declspec(dllexport) type __stdcall #define SWITCH_DECLARE(type) __declspec(dllexport) type __stdcall
#define SWITCH_DECLARE_NONSTD(type) __declspec(dllexport) type __cdecl #define SWITCH_DECLARE_NONSTD(type) __declspec(dllexport) type __cdecl
#define SWITCH_DECLARE_DATA __declspec(dllexport) #define SWITCH_DECLARE_DATA __declspec(dllexport)
#else #else
#define SWITCH_DECLARE(type) __declspec(dllimport) type __stdcall #define SWITCH_DECLARE(type) __declspec(dllimport) type __stdcall
#define SWITCH_DECLARE_NONSTD(type) __declspec(dllimport) type __cdecl #define SWITCH_DECLARE_NONSTD(type) __declspec(dllimport) type __cdecl
#define SWITCH_DECLARE_DATA __declspec(dllimport) #define SWITCH_DECLARE_DATA __declspec(dllimport)
#endif #endif
#if defined(SWITCH_MOD_DECLARE_STATIC) #if defined(SWITCH_MOD_DECLARE_STATIC)
#define SWITCH_MOD_DECLARE(type) type __cdecl #define SWITCH_MOD_DECLARE(type) type __cdecl
#elif defined(MOD_EXPORTS) #elif defined(MOD_EXPORTS)
#define SWITCH_MOD_DECLARE(type) __declspec(dllexport) type __cdecl #define SWITCH_MOD_DECLARE(type) __declspec(dllexport) type __cdecl
#else #else
#define SWITCH_MOD_DECLARE(type) __declspec(dllimport) type __cdecl #define SWITCH_MOD_DECLARE(type) __declspec(dllimport) type __cdecl
#endif #endif
#else //not win32 #else //not win32
#define SWITCH_DECLARE(type) type #define SWITCH_DECLARE(type) type

2
src/include/switch_sqlite.h
View File

@ -35,6 +35,8 @@
extern "C" { extern "C" {
#endif #endif
#include <sqlite3.h>
typedef sqlite3 switch_core_db; typedef sqlite3 switch_core_db;
#define switch_core_db_aggregate_context sqlite3_aggregate_context #define switch_core_db_aggregate_context sqlite3_aggregate_context

2
src/include/switch_types.h
View File

@ -152,7 +152,6 @@ typedef struct switch_event_header switch_event_header;
typedef struct switch_event switch_event; typedef struct switch_event switch_event;
typedef struct switch_event_subclass switch_event_subclass; typedef struct switch_event_subclass switch_event_subclass;
typedef struct switch_event_node switch_event_node; typedef struct switch_event_node switch_event_node;
typedef void (*switch_event_callback_t)(switch_event *);
typedef struct switch_loadable_module switch_loadable_module; typedef struct switch_loadable_module switch_loadable_module;
typedef struct switch_frame switch_frame; typedef struct switch_frame switch_frame;
typedef struct switch_channel switch_channel; typedef struct switch_channel switch_channel;
@ -188,6 +187,7 @@ typedef struct switch_io_event_hooks switch_io_event_hooks;
typedef struct switch_buffer switch_buffer; typedef struct switch_buffer switch_buffer;
typedef struct switch_codec_settings switch_codec_settings; typedef struct switch_codec_settings switch_codec_settings;
typedef void (*switch_application_function)(switch_core_session *, char *); typedef void (*switch_application_function)(switch_core_session *, char *);
typedef void (*switch_event_callback_t)(switch_event *);
typedef switch_caller_extension *(*switch_dialplan_hunt_function)(switch_core_session *); typedef switch_caller_extension *(*switch_dialplan_hunt_function)(switch_core_session *);
typedef switch_status (*switch_event_handler)(switch_core_session *); typedef switch_status (*switch_event_handler)(switch_core_session *);
typedef switch_status (*switch_outgoing_channel_hook)(switch_core_session *, switch_caller_profile *, switch_core_session *); typedef switch_status (*switch_outgoing_channel_hook)(switch_core_session *, switch_caller_profile *, switch_core_session *);