[evolution-kolab/gnome-2-30] libekolabconv: ISO C forbids conditional expr with only one void side

[Christian Hilberg <chilberg src gnome org>]

commit ab3d77c960878b01fa37d82f9ea6645f84829196
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Thu Nov 17 19:17:06 2011 +0100

    libekolabconv: ISO C forbids conditional expr with only one void side
    
    * explicitly (void) the NULL right side of the 'foo() ? bar() : NULL'
      expressions in test-kolab-contact.c

 src/libekolabconv/test/src/test-kolab-contact.c |   24 +++++++++++-----------
 1 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/libekolabconv/test/src/test-kolab-contact.c b/src/libekolabconv/test/src/test-kolab-contact.c
index 0c74bad..36a0e9d 100644
--- a/src/libekolabconv/test/src/test-kolab-contact.c
+++ b/src/libekolabconv/test/src/test-kolab-contact.c
@@ -344,13 +344,13 @@ validate_kolab_contact_200 (const I_contact *icontact, gint stage)
 #endif
 
 	/* The x-custom fields are written manually to kolab store while writing evolution */
-	IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 11, "x-custom") : NULL ;
-	IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 12, "x-custom") : NULL ;
-	IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 13, "x-custom") : NULL ;
-	IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 14, "x-custom") : NULL ;
-	IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 15, "x-custom") : NULL ;
-	IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 16, "x-custom") : NULL ;
-	IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 17, "x-custom") : NULL ;
+	IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 11, "x-custom") : (void)NULL ;
+	IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 12, "x-custom") : (void)NULL ;
+	IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 13, "x-custom") : (void)NULL ;
+	IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 14, "x-custom") : (void)NULL ;
+	IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 15, "x-custom") : (void)NULL ;
+	IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 16, "x-custom") : (void)NULL ;
+	IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 17, "x-custom") : (void)NULL ;
 }
 
 void
@@ -492,11 +492,11 @@ validate_kolab_contact_300 (const I_contact *icontact, gint stage)
 	validate_kolab_store_xml(list, 6, "unknown4");
 
 	/* The x-custom fields are written manually to kolab store while writing evolution */
-	IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 7, "x-custom") : NULL ;
-	IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 8, "x-custom") : NULL ;
-	IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 9, "x-custom") : NULL ;
-	IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 10, "x-custom") : NULL ;
-	IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 11, "x-custom") : NULL ;
+	IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 7, "x-custom") : (void)NULL ;
+	IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 8, "x-custom") : (void)NULL ;
+	IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 9, "x-custom") : (void)NULL ;
+	IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 10, "x-custom") : (void)NULL ;
+	IS_TEST_STAGE_EVO_TO_INTERN(stage) ? validate_kolab_store_xml(list, 11, "x-custom") : (void)NULL ;
 
 	/* test elements below phone number elements */