[Opalvoip-svn] SF.net SVN: opalvoip:[34815] opal/trunk

[<rjo...@us...>]

Revision: 34815
          http://sourceforge.net/p/opalvoip/code/34815
Author:   rjongbloed
Date:     2016-05-05 11:40:21 +0000 (Thu, 05 May 2016)
Log Message:
-----------
Fixed recent SRTP const issue change for different platforms

Modified Paths:
--------------
    opal/trunk/configure
    opal/trunk/configure.ac
    opal/trunk/src/rtp/srtp_session.cxx

Modified: opal/trunk/configure
===================================================================
--- opal/trunk/configure	2016-05-05 11:05:32 UTC (rev 34814)
+++ opal/trunk/configure	2016-05-05 11:40:21 UTC (rev 34815)
@@ -7192,7 +7192,7 @@
 $as_echo_n "checking for SRTP const in error functions... " >&6; }
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#inclide <srtp/srtp.h>
+#include <srtp/srtp.h>
 int
 main ()
 {
@@ -7230,9 +7230,7 @@
       $as_echo "#define HAS_SRTP_SRTP_H 0" >>confdefs.h
 
       SRTP_MSG="yes (internal)"
-      $as_echo "#define OPAL_SRTP_ERROR_CONST /*const*/" >>confdefs.h
 
-
 fi
 
 fi

Modified: opal/trunk/configure.ac
===================================================================
--- opal/trunk/configure.ac	2016-05-05 11:05:32 UTC (rev 34814)
+++ opal/trunk/configure.ac	2016-05-05 11:40:21 UTC (rev 34815)
@@ -188,7 +188,7 @@
       MY_COMPILE_IFELSE(
          [for SRTP const in error functions],
          [],
-         [#inclide <srtp/srtp.h>],
+         [#include <srtp/srtp.h>],
          [err_status_t err_reporting_init(const char *ident)],
          [AC_DEFINE(OPAL_SRTP_ERROR_CONST, const)]
       )
@@ -196,7 +196,6 @@
       AC_CONFIG_SUBDIRS(src/rtp/libsrtp)
       AC_DEFINE(HAS_SRTP_SRTP_H,0)
       SRTP_MSG="yes (internal)"
-      AC_DEFINE(OPAL_SRTP_ERROR_CONST, [/*const*/])
    ])
 )
 

Modified: opal/trunk/src/rtp/srtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/srtp_session.cxx	2016-05-05 11:05:32 UTC (rev 34814)
+++ opal/trunk/src/rtp/srtp_session.cxx	2016-05-05 11:40:21 UTC (rev 34815)
@@ -177,6 +177,10 @@
 #define CHECK_ERROR(fn, param, ...) ((fn param) == err_status_ok)
 #endif //PTRACING
 
+#ifndef OPAL_SRTP_ERROR_CONST
+  #define OPAL_SRTP_ERROR_CONST
+#endif
+
 extern "C" {
   err_reporting_level_t err_level = err_level_none;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.