[asterisk-scf-commits] asterisk-scf/release/media_operations_core.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  ccb310e61f696d54ec43df4b074c1cf35ac1e148 (commit)
      from  4c8110ac58ac8632e5021ece81d5235965f98eca (commit)

Summary of changes:
 src/CMakeLists.txt     |    2 +-
 src/g722/g722_decode.c |   11 ++++++++++-
 src/g722/g722_encode.c |   11 ++++++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit ccb310e61f696d54ec43df4b074c1cf35ac1e148
Author: Brent Eagles <beagles at digium.com>
Date:   Fri Sep 16 14:24:30 2011 -0230

    Some fixes for building on Windows

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b7aee9c..8fb6d1f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,6 +29,7 @@ astscf_component_add_files(MediaOperationsCore MediaOperationReplicationContext.
 astscf_component_add_files(MediaOperationsCore MediaOperationStateReplicator.h)
 astscf_component_add_slices(MediaOperationsCore PROJECT AsteriskSCF/Replication/MediaOperationsCore/MediaOperationsCoreIf.ice)
 astscf_component_add_slice_collection_libraries(MediaOperationsCore ASTSCF)
+astscf_component_add_boost_libraries(MediaOperationsCore core thread date_time)
 astscf_component_build_icebox(MediaOperationsCore)
 target_link_libraries(MediaOperationsCore logging-client astscf-ice-util-cpp)
 
@@ -36,7 +37,6 @@ pjproject_link(MediaOperationsCore pjlib)
 pjproject_link(MediaOperationsCore pjlib-util)
 pjproject_link(MediaOperationsCore pjmedia)
 pjproject_link(MediaOperationsCore pjnath)
-pjproject_link(MediaOperationsCore resample)
 astscf_component_install(MediaOperationsCore)
 
 astscf_component_init(MediaOperationStateReplicator)
diff --git a/src/g722/g722_decode.c b/src/g722/g722_decode.c
index 233bee5..0f33daf 100644
--- a/src/g722/g722_decode.c
+++ b/src/g722/g722_decode.c
@@ -28,7 +28,16 @@
 #endif
 
 #include <stdio.h>
+
+#ifndef _WIN32
 #include <inttypes.h>
+#define INLINE __inline__
+#else
+#ifndef INLINE
+#define INLINE /**/
+#endif 
+#endif
+
 #include <memory.h>
 #include <stdlib.h>
 #if 0
@@ -44,7 +53,7 @@
 #define TRUE (!FALSE)
 #endif
 
-static __inline__ int16_t saturate(int32_t amp)
+static INLINE int16_t saturate(int32_t amp)
 {
     int16_t amp16;
 
diff --git a/src/g722/g722_encode.c b/src/g722/g722_encode.c
index db563a7..ed2d165 100644
--- a/src/g722/g722_encode.c
+++ b/src/g722/g722_encode.c
@@ -30,7 +30,16 @@
 #endif
 
 #include <stdio.h>
+
+#ifndef _WIN32
 #include <inttypes.h>
+#define INLINE __inline__
+#else
+#ifndef INLINE
+#define INLINE /**/
+#endif 
+#endif
+
 #include <memory.h>
 #include <stdlib.h>
 #if 0
@@ -46,7 +55,7 @@
 #define TRUE (!FALSE)
 #endif
 
-static __inline__ int16_t saturate(int32_t amp)
+static INLINE int16_t saturate(int32_t amp)
 {
     int16_t amp16;
 

-----------------------------------------------------------------------


-- 
asterisk-scf/release/media_operations_core.git