Merge branch 'master' into smgmaster

This commit is contained in:
Moises Silva
2011-07-29 17:07:24 -04:00
17 changed files with 160 additions and 79 deletions
+3
View File
@@ -41,6 +41,9 @@
#define SWITCH_APR_H
SWITCH_BEGIN_EXTERN_C
SWITCH_DECLARE(int) switch_status_is_timeup(int status);
#ifdef WIN32
typedef DWORD switch_thread_id_t;
#else