ben.carrasco/freeswitch
1
0 Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-11-08 12:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Core] Fix Windows build after apr-util removal

Browse Source
This commit is contained in:
Andrey Volk committed 2022-08-29 20:17:12 +03:00
1 parent 85d25e269b
commit dd3075a203
12 files changed
+86 -1524
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/mod/languages/mod_managed/mod_managed.2017.vcxproj
+8 -8
View File
@@ -155,7 +155,7 @@
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<DisableSpecificWarnings>4505;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4505;6553;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<TreatWarningAsError>true</TreatWarningAsError>
</ClCompile>
<Link>
@@ -178,7 +178,7 @@
<PrecompiledHeader>
</PrecompiledHeader>
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>4505;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4505;6553;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
<AdditionalDependencies>shlwapi.lib;mscoree.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -196,7 +196,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
<DisableSpecificWarnings>4505;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4505;6553;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<IntrinsicFunctions>true</IntrinsicFunctions>
</ClCompile>
<Link>
@@ -217,7 +217,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
<DisableSpecificWarnings>4505;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4505;6553;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
<ModuleDefinitionFile>
@@ -237,7 +237,7 @@
<PrecompiledHeader>
</PrecompiledHeader>
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>4505;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4505;6553;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
<AdditionalDependencies>shlwapi.lib;mono.lib;C:\program Files\Mono\lib\glib-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -261,7 +261,7 @@
<PrecompiledHeader>
</PrecompiledHeader>
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>4505;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4505;6553;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
<AdditionalDependencies>shlwapi.lib;mono.lib;C:\program Files\Mono\lib\glib-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -283,7 +283,7 @@
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DisableSpecificWarnings>4505;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4505;6553;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
<ModuleDefinitionFile>
@@ -305,7 +305,7 @@
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DisableSpecificWarnings>4505;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4505;6553;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
<ModuleDefinitionFile>
src/switch_apr.c
+2
View File
@@ -77,7 +77,9 @@
#include <openssl/md5.h>
#endif
#ifndef WIN32
#include <uuid/uuid.h>
#endif
/* apr stubs */
src/switch_apr_queue.c
+1
View File
@@ -14,6 +14,7 @@
* limitations under the License.
*/
#include <switch.h>
#include <fspr.h>
#include <fspr_thread_mutex.h>
#include <fspr_thread_cond.h>
src/switch_time.c
+1 -1
View File
@@ -179,7 +179,7 @@ static void do_sleep(switch_interval_time_t t)
ts.tv_nsec = (t % APR_USEC_PER_SEC) * 850;
nanosleep(&ts, NULL);
#else
apr_sleep(t);
fspr_sleep(t);
#endif
#if defined(DARWIN)
src/switch_xml.c
+10 -10
View File
@@ -63,7 +63,7 @@
#include <glob.h>
#else /* we're on windoze :( */
/* glob functions at end of this file */
#include <apr_file_io.h>
#include <fspr_file_io.h>
typedef struct {
size_t gl_pathc; /* Count of total paths so far. */
@@ -3626,19 +3626,19 @@ static int glob2(char *pathbuf, char *pathend, char *pathend_last, char *pattern
static int glob3(char *pathbuf, char *pathend, char *pathend_last, char *pattern, char *restpattern, glob_t *pglob, size_t *limit)
{
int err;
apr_dir_t *dirp;
apr_pool_t *pool;
fspr_dir_t *dirp;
fspr_pool_t *pool;
apr_pool_create(&pool, NULL);
fspr_pool_create(&pool, NULL);
if (pathend > pathend_last)
return (GLOB_ABORTED);
*pathend = EOS;
errno = 0;
if (apr_dir_open(&dirp, pathbuf, pool) != APR_SUCCESS) {
if (fspr_dir_open(&dirp, pathbuf, pool) != APR_SUCCESS) {
/* TODO: don't call for ENOENT or ENOTDIR? */
apr_pool_destroy(pool);
fspr_pool_destroy(pool);
if (pglob->gl_errfunc) {
if (pglob->gl_errfunc(pathbuf, errno) || pglob->gl_flags & GLOB_ERR)
return (GLOB_ABORTED);
@@ -3650,11 +3650,11 @@ static int glob3(char *pathbuf, char *pathend, char *pathend_last, char *pattern
/* Search directory for matching names. */
while (dirp) {
apr_finfo_t dp;
fspr_finfo_t dp;
unsigned char *sc;
char *dc;
if (apr_dir_read(&dp, APR_FINFO_NAME, dirp) != APR_SUCCESS)
if (fspr_dir_read(&dp, APR_FINFO_NAME, dirp) != APR_SUCCESS)
break;
if (!(dp.valid & APR_FINFO_NAME) || !(dp.name) || !strlen(dp.name))
break;
@@ -3677,8 +3677,8 @@ static int glob3(char *pathbuf, char *pathend, char *pathend_last, char *pattern
}
if (dirp)
apr_dir_close(dirp);
apr_pool_destroy(pool);
fspr_dir_close(dirp);
fspr_pool_destroy(pool);
return (err);
}