]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
fix msvc build.
authorMichael Jerris <mike@jerris.com>
Wed, 12 Dec 2007 02:10:52 +0000 (02:10 +0000)
committerMichael Jerris <mike@jerris.com>
Wed, 12 Dec 2007 02:10:52 +0000 (02:10 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6692 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/include/switch_platform.h
src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c
src/mod/formats/mod_local_stream/mod_local_stream.c
w32/Library/FreeSwitchCore.2008.vcproj

index f266d9b902dc8ab0cc24aca590417185931f74a5..5766620f5fa13c304c489cb8606913d24978f1ac 100644 (file)
@@ -215,6 +215,10 @@ typedef intptr_t switch_ssize_t;
 #define SWITCH_INT64_T_FMT          "I64d"
 #define SWITCH_UINT64_T_FMT         "I64u"
 
+#ifndef TIME_T_FMT
+#define TIME_T_FMT "ld"
+#endif
+
 #else
 #ifndef SWITCH_SSIZE_T_FMT
 #define SWITCH_SSIZE_T_FMT          (sizeof (switch_ssize_t) == sizeof (long) ? "ld" : sizeof (switch_ssize_t) == sizeof (int) ? "d" : "lld")
index b2e164117bef41a8fbe18c7a77c9c92b5fc39439..45a538a0ff02207285091402e11fe724a3702ccb 100644 (file)
@@ -238,12 +238,12 @@ static switch_status_t my_on_hangup(switch_core_session_t *session)
                switch_channel_set_variable(channel, "end_uepoch", tmp);
 
                uduration = caller_profile->times->hungup - caller_profile->times->created;
-               duration = tt_hungup - tt_created;
-               mduration = mtt_hungup - mtt_created;
+               duration = (int32_t)(tt_hungup - tt_created);
+               mduration = (int32_t)(mtt_hungup - mtt_created);
                
                if (caller_profile->times->answered) {
-                       billsec = tt_hungup - tt_answered;
-                       billmsec = mtt_hungup - mtt_answered;
+                       billsec = (int32_t)(tt_hungup - tt_answered);
+                       billmsec = (int32_t)(mtt_hungup - mtt_answered);
                        billusec = caller_profile->times->hungup - caller_profile->times->answered;
                }
        }
index 70843b9dc62591a44b470cc0cd9332580c9dc8c8..b687bc206cf8a6f3373e347d61a5adc1d9f82a61 100644 (file)
@@ -104,8 +104,7 @@ static void *SWITCH_THREAD_FUNC read_stream_thread(switch_thread_t *thread, void
 
                        snprintf(path_buf, sizeof(path_buf), "%s%s%s", source->location, SWITCH_PATH_SEPARATOR, fname);
                        if (switch_stristr(".loc", path_buf)) {
-                               int fd;
-                               ssize_t bytes;
+                               int fd, bytes;
                                char *p;
 
                                if ((fd = open(path_buf, O_RDONLY)) < 0) {
index 78db6e7114d716c6705d67060a344fbe2c948df5..9b31ca4198080c1a15e690ef96d50149a867f1e6 100644 (file)
@@ -45,6 +45,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libresample\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\include\private\switch_core.h"\r
+                               RelativePath="..\..\src\include\switch_core.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\include\switch_core.h"\r
+                               RelativePath="..\..\src\include\private\switch_core.h"\r
                                >\r
                        </File>\r
                        <File\r