Changeset 1802 for pjproject/trunk

Timestamp:

Feb 18, 2008 12:16:23 PM (17 years ago)

Author:

bennylp

Message:

Fixed build error if SRTP is disabled in compile time (thanks Helmut Wolf)

Location:

pjproject/trunk/pjsip-apps/src

Files:

• pjsua/pjsua_app.c (modified) (2 diffs)
• samples/pcaputil.c (modified) (4 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -1325 +1325 @@
 
     /* SRTP */
+#if PJMEDIA_HAS_SRTP
     if (app_config.cfg.use_srtp != PJSUA_DEFAULT_USE_SRTP) {
         pj_ansi_sprintf(line, "--use-srtp %d\n",
@@ -1337 +1338 @@
         pj_strcat2(&cfg, line);
     }
-
+#endif
 
     /* Media */

pjproject/trunk/pjsip-apps/src/samples/pcaputil.c

@@ -155 +155 @@
 
         /* Decrypt SRTP */
+#if PJMEDIA_HAS_SRTP
         if (app.srtp) {
             int len = sz;
@@ -178 +179 @@
             }
         }
+#endif
 
         /* Update RTP session */
@@ -247 +249 @@
 
     /* Create SRTP transport is needed */
+#if PJMEDIA_HAS_SRTP
     if (srtp_crypto->slen) {
         pjmedia_srtp_crypto crypto;
@@ -256 +259 @@
         T( pjmedia_transport_srtp_start(app.srtp, &crypto, &crypto) );
     }
+#else
+    PJ_UNUSED_ARG(srtp_crypto);
+    PJ_UNUSED_ARG(srtp_key);
+#endif
 
     /* Read first packet */