提交 1b97a9b8 authored 作者: Michael Jerris's avatar Michael Jerris

msvc build fixes to core from XMLification commit.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1408 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 f5f1f5f2
...@@ -68,6 +68,10 @@ BEGIN_EXTERN_C ...@@ -68,6 +68,10 @@ BEGIN_EXTERN_C
#define SWITCH_SCRIPT_DIR SWITCH_PREFIX_DIR SWITCH_PATH_SEPARATOR "scripts" #define SWITCH_SCRIPT_DIR SWITCH_PREFIX_DIR SWITCH_PATH_SEPARATOR "scripts"
#endif #endif
#ifndef SWITCH_HTDOCS_DIR
#define SWITCH_HTDOCS_DIR SWITCH_PREFIX_DIR SWITCH_PATH_SEPARATOR "htdocs"
#endif
struct switch_directories { struct switch_directories {
char *base_dir; char *base_dir;
char *mod_dir; char *mod_dir;
......
...@@ -932,7 +932,7 @@ static char *switch_xml_ampencode(const char *s, switch_size_t len, char **dst, ...@@ -932,7 +932,7 @@ static char *switch_xml_ampencode(const char *s, switch_size_t len, char **dst,
// Recursively converts each tag to xml appending it to *s. Reallocates *s if // Recursively converts each tag to xml appending it to *s. Reallocates *s if
// its length excedes max. start is the location of the previous tag in the // its length excedes max. start is the location of the previous tag in the
// parent tag's character content. Returns *s. // parent tag's character content. Returns *s.
SWITCH_DECLARE(static char *) switch_xml_toxml_r(switch_xml_t xml, char **s, switch_size_t *len, switch_size_t *max, static char *switch_xml_toxml_r(switch_xml_t xml, char **s, switch_size_t *len, switch_size_t *max,
switch_size_t start, char ***attr) switch_size_t start, char ***attr)
{ {
int i, j; int i, j;
...@@ -984,7 +984,7 @@ SWITCH_DECLARE(static char *) switch_xml_toxml_r(switch_xml_t xml, char **s, swi ...@@ -984,7 +984,7 @@ SWITCH_DECLARE(static char *) switch_xml_toxml_r(switch_xml_t xml, char **s, swi
// converts an switch_xml structure back to xml, returning it as a string that must // converts an switch_xml structure back to xml, returning it as a string that must
// be freed // be freed
char *switch_xml_toxml(switch_xml_t xml) SWITCH_DECLARE(char *) switch_xml_toxml(switch_xml_t xml)
{ {
switch_xml_t p = (xml) ? xml->parent : NULL, o = (xml) ? xml->ordered : NULL; switch_xml_t p = (xml) ? xml->parent : NULL, o = (xml) ? xml->ordered : NULL;
switch_xml_root_t root = (switch_xml_root_t)xml; switch_xml_root_t root = (switch_xml_root_t)xml;
......
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
CommandLine="xcopy $(Projectdir)..\..\conf\*.* $(Outdir)\conf\ /C /D /Y&#x0D;&#x0A;xcopy &quot;$(Projectdir)..\..\libs\sqlite\$(IntDir) DLL\*.dll&quot; $(Outdir)\ /C /D /Y&#x0D;&#x0A;xcopy &quot;$(Projectdir)..\..\libs\sqlite\$(IntDir) DLL\*.lib&quot; $(Outdir)\ /C /D /Y&#x0D;&#x0A;if not exist $(Outdir)\db md $(Outdir)\db&#x0D;&#x0A;if not exist $(Outdir)\log md $(Outdir)\log&#x0D;&#x0A;" CommandLine="xcopy $(Projectdir)..\..\conf\*.* $(Outdir)\conf\ /C /D /Y&#x0D;&#x0A;xcopy &quot;$(Projectdir)..\..\libs\sqlite\$(IntDir) DLL\*.dll&quot; $(Outdir)\ /C /D /Y&#x0D;&#x0A;xcopy &quot;$(Projectdir)..\..\libs\sqlite\$(IntDir) DLL\*.lib&quot; $(Outdir)\ /C /D /Y&#x0D;&#x0A;if not exist $(Outdir)\db md $(Outdir)\db&#x0D;&#x0A;if not exist $(Outdir)\log md $(Outdir)\log&#x0D;&#x0A;if not exist $(Outdir)\log md $(Outdir)\htdocs&#x0D;&#x0A;&#x0D;&#x0A;"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
CommandLine="xcopy $(Projectdir)..\..\conf\*.* $(Outdir)\conf\ /C /D /Y&#x0D;&#x0A;xcopy &quot;$(Projectdir)..\..\libs\sqlite\$(IntDir) DLL\*.dll&quot; $(Outdir)\ /C /D /Y&#x0D;&#x0A;xcopy &quot;$(Projectdir)..\..\libs\sqlite\$(IntDir) DLL\*.lib&quot; $(Outdir)\ /C /D /Y&#x0D;&#x0A;if not exist $(Outdir)\db md $(Outdir)\db&#x0D;&#x0A;if not exist $(Outdir)\log md $(Outdir)\log&#x0D;&#x0A;" CommandLine="xcopy $(Projectdir)..\..\conf\*.* $(Outdir)\conf\ /C /D /Y&#x0D;&#x0A;xcopy &quot;$(Projectdir)..\..\libs\sqlite\$(IntDir) DLL\*.dll&quot; $(Outdir)\ /C /D /Y&#x0D;&#x0A;xcopy &quot;$(Projectdir)..\..\libs\sqlite\$(IntDir) DLL\*.lib&quot; $(Outdir)\ /C /D /Y&#x0D;&#x0A;if not exist $(Outdir)\db md $(Outdir)\db&#x0D;&#x0A;if not exist $(Outdir)\log md $(Outdir)\log&#x0D;&#x0A;if not exist $(Outdir)\log md $(Outdir)\htdocs&#x0D;&#x0A;&#x0D;&#x0A;"
/> />
</Configuration> </Configuration>
</Configurations> </Configurations>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论