]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
make build on windows.
authorMichael Jerris <mike@jerris.com>
Fri, 5 Jan 2007 16:49:36 +0000 (16:49 +0000)
committerMichael Jerris <mike@jerris.com>
Fri, 5 Jan 2007 16:49:36 +0000 (16:49 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3912 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/applications/mod_dptools/mod_dptools.c
src/mod/say/mod_say_en/mod_say_en.c
src/switch_ivr.c

index 506178b9e96d70389d4b8e494b8078c6c8abf861..f3bf24302639575e4aae21ba0a4776d9e7791413 100644 (file)
@@ -291,6 +291,8 @@ static switch_status_t strepoch_api_function(char *data, switch_core_session_t *
     }
 
     stream->write_function(stream, "%d", (uint32_t)apr_time_sec(out));
+
+       return SWITCH_STATUS_SUCCESS;
 }
 
 static switch_status_t strftime_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream)
index 8d4d2b6efd519775cdcb25d77791a4c9f5e46adf..950dd3e65ecc22eef260d3ff5afdfc016ca3fd5e 100644 (file)
@@ -402,13 +402,10 @@ static switch_status_t en_say_money(switch_core_session_t *session,
 {
        switch_channel_t *channel;
                
-       int x = 0;
        char sbuf[16] = ""; // enuf for 999,999,999,999.99 (w/o the commas)
        
        double amt, dollars, cents;
                
-       switch_status_t status;
-       
        assert(session != NULL);
        channel = switch_core_session_get_channel(session);
        assert(channel != NULL);
@@ -419,9 +416,7 @@ static switch_status_t en_say_money(switch_core_session_t *session,
        }
 
        amt = atof(tosay);  //convert to double
-       dollars = trunc(amt); // get whole dollars
-       cents = trunc(fabs((amt - dollars))*100.0); // get cents as whole integer (dropping sign)
-       dollars = fabs(dollars); // lose the sign
+       cents = modf(fabs(amt), &dollars); // split dollars and cents
        
        // If negative say "negative" (or "minus")
        if (amt < 0.0) {
index adfc3a3114aada5a6ca6566e5f259a3f669adc99..5524bdb2a47125f9fec94b604ea6d887d9554e55 100644 (file)
@@ -2389,7 +2389,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
         for (hi = switch_channel_variable_first(caller_channel, switch_core_session_get_pool(session)); hi; hi = switch_hash_next(hi)) {
             switch_hash_this(hi, &vvar, NULL, &vval);
             if (vvar && vval) {
-                switch_event_add_header(var_event, SWITCH_STACK_BOTTOM, vvar, vval);
+                switch_event_add_header(var_event, SWITCH_STACK_BOTTOM, (void *)vvar, vval);
             }
         }