Changeset 2832 for pjproject/trunk

Timestamp:

Jul 14, 2009 1:45:52 PM (15 years ago)

Author:

nanang

Message:

Ticket #918: Added C compatible declarations in modules: G.711, transport SRTP, libresample.

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/g711.c (modified) (1 diff)
• pjmedia/src/pjmedia/transport_srtp.c (modified) (1 diff)
• third_party/resample/include/resamplesubs.h (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/g711.c

@@ -21 +21 @@
  * notice in the second half of this file.
  */
+#include <pjmedia/g711.h>
 #include <pjmedia/codec.h>
 #include <pjmedia/alaw_ulaw.h>

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

@@ -216 +216 @@
 };
 
+/* This function may also be used by other module, e.g: pjmedia/errno.c,
+ * it should have C compatible declaration.
+ */
+PJ_BEGIN_DECL
+    const char* get_libsrtp_errstr(int err);
+PJ_END_DECL
+
 const char* get_libsrtp_errstr(int err)
 {

pjproject/trunk/third_party/resample/include/resamplesubs.h

@@ -14 +14 @@
 #endif
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 DECL(int) res_SrcLinear(const RES_HWORD X[], RES_HWORD Y[], 
                         double pFactor, RES_UHWORD nx);
@@ -20 +25 @@
 DECL(int) res_GetXOFF(double pFactor, RES_BOOL LargeF);
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif