Avoid ?: GCC-ism

[vlc] / src / misc / variables.c

diff --git a/src/misc/variables.c b/src/misc/variables.c
index 80caffffe734f6131b4981ff9659aedcfae6a64c..1242431c222e59920bb2bc463dac9af9297ed504 100644 (file)
--- a/src/misc/variables.c
+++ b/src/misc/variables.c
@@ -68,7 +68,10 @@ static int CmpAddress( vlc_value_t v, vlc_value_t w ) { return v.p_address == w.
  * Local duplication functions, and local deallocation functions
  *****************************************************************************/
 static void DupDummy( vlc_value_t *p_val ) { (void)p_val; /* unused */ }
-static void DupString( vlc_value_t *p_val ) { p_val->psz_string = strdup( p_val->psz_string ?: ""); }
+static void DupString( vlc_value_t *p_val )
+{
+    p_val->psz_string = strdup( p_val->psz_string ? p_val->psz_string :  "" );
+}
 
 static void DupList( vlc_value_t *p_val )
 {
@@ -1407,8 +1410,9 @@ static int InheritValue( vlc_object_t *p_this, const char *psz_name,
             p_var->ops->pf_dup( p_val );
 
             /*msg_Dbg( p_this, "Inherited value for var %s from object %s",
-                     psz_name ? : "(null)",
-                     p_this->psz_object_name ? : "(Unknown)" );*/
+                     psz_name ? psz_name : "(null)",
+                     p_this->psz_object_name
+                         ? p_this->psz_object_name : "(Unknown)" );*/
             return VLC_SUCCESS;
         }
         else if ( p_this->p_parent ) /* We are still not there */