mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-02 01:25:11 +00:00
add curl and teletone to mod_spidermonkey. fix /tmp/ dir for windows, added global temp dir var. Multiple type fixes.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@713 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
1 parent
1588f9e767
commit
92a326c1da
11 files changed
+1722
-25
No files matched your search
@@ -29,7 +29,11 @@
|
||||
* mod_spidermonkey.c -- Javascript Module
|
||||
*
|
||||
*/
|
||||
#ifndef HAVE_CURL
|
||||
#define HAVE_CURL
|
||||
#endif
|
||||
|
||||
#include <switch.h>
|
||||
|
||||
#include "jstypes.h"
|
||||
#include "jsarena.h"
|
||||
@@ -48,7 +52,6 @@
|
||||
#include "jsscope.h"
|
||||
#include "jsscript.h"
|
||||
#include <libteletone.h>
|
||||
#include <switch.h>
|
||||
#ifdef HAVE_CURL
|
||||
#include <curl/curl.h>
|
||||
#endif
|
||||
@@ -572,7 +575,7 @@ struct config_data {
|
||||
|
||||
static size_t realtime_callback(void *ptr, size_t size, size_t nmemb, void *data)
|
||||
{
|
||||
register int realsize = size * nmemb;
|
||||
register size_t realsize = size * nmemb;
|
||||
char *line, lineb[2048], *nextline = NULL, *val = NULL, *p = NULL;
|
||||
jsval rval;
|
||||
struct config_data *config_data = data;
|
||||
@@ -1025,7 +1028,7 @@ static const char c64[65] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxy
|
||||
|
||||
static int write_buf(int fd, char *buf) {
|
||||
|
||||
size_t len = strlen(buf);
|
||||
int len = (int)strlen(buf);
|
||||
if (fd && write(fd, buf, len) != len) {
|
||||
close(fd);
|
||||
return 0;
|
||||
@@ -1056,9 +1059,8 @@ static JSBool js_email(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js
|
||||
) {
|
||||
if ( argc > 4)
|
||||
file = JS_GetStringBytes(JS_ValueToString(cx, argv[4]));
|
||||
|
||||
|
||||
snprintf(filename, 80, "/tmp/mail.%ld", switch_time_now());
|
||||
|
||||
snprintf(filename, 80, "%smail.%ld", SWITCH_GLOBAL_dirs.temp_dir, switch_time_now());
|
||||
|
||||
if ((fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0644))) {
|
||||
if (file) {
|
||||
|
||||
@@ -42,8 +42,8 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API"
|
||||
AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\curl\include";"$(InputDir)..\..\..\..\libs\libteletone\src""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
@@ -64,10 +64,10 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="js32.lib"
|
||||
AdditionalDependencies="js32.lib curllib.lib ws2_32.lib winmm.lib"
|
||||
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_spidermonkey.dll"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="$(InputDir)..\..\..\..\libs\js\src\Debug"
|
||||
AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\js\src\Debug";"$(InputDir)..\..\..\..\libs\curl\lib\Debug""
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(OutDir)/mod_spidermonkey.pdb"
|
||||
SubSystem="2"
|
||||
@@ -125,8 +125,8 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API"
|
||||
AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\curl\include";"$(InputDir)..\..\..\..\libs\libteletone\src""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB"
|
||||
RuntimeLibrary="2"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="4"
|
||||
@@ -145,10 +145,10 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="js32.lib"
|
||||
AdditionalDependencies="js32.lib curllib.lib ws2_32.lib winmm.lib"
|
||||
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_spidermonkey.dll"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="$(InputDir)..\..\..\..\libs\js\Release"
|
||||
AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\js\Release";"$(InputDir)..\..\..\..\libs\curl\lib\Release""
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
OptimizeReferences="2"
|
||||
|
||||
Reference in new issue
Block a user