X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-args.c;h=1dc2e6ca747f76484c892a4cc7a979e6d7419806;hb=ec0564bc90b3c63f7e82f09e81db8bd2cfac89a2;hp=05a88655797836fe232edc6016d5522546a610f1;hpb=84f4aec41817417a3b94d91da1b9b2fba9711e40;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-args.c b/src/afb-args.c
index 05a88655..1dc2e6ca 100644
--- a/src/afb-args.c
+++ b/src/afb-args.c
@@ -109,7 +109,7 @@
 #endif
 #define SET_TRAP_FAULTS     27
 #define ADD_CALL            28
-#if defined(WITH_DBUS_TRANSPARENCY)
+#if WITH_DBUS_TRANSPARENCY
 #   define ADD_DBUS_CLIENT  30
 #   define ADD_DBUS_SERVICE 31
 #endif
@@ -185,7 +185,7 @@ static struct option_desc optdefs[] = {
 	{GET_VERSION,         0, "version",     "Display version and copyright"},
 	{GET_HELP,            0, "help",        "Display this help"},
 
-#if defined(WITH_DBUS_TRANSPARENCY)
+#if WITH_DBUS_TRANSPARENCY
 	{ADD_DBUS_CLIENT,     1, "dbus-client", "Bind to an afb service through dbus"},
 	{ADD_DBUS_SERVICE,    1, "dbus-server", "Provide an afb service through dbus"},
 #endif
@@ -335,7 +335,7 @@ static void printVersion(FILE * file)
 		"\n"
 		"  AGL Framework Binder [AFB %s] "
 
-#if defined(WITH_DBUS_TRANSPARENCY)
+#if WITH_DBUS_TRANSPARENCY
 		"+"
 #else
 		"-"
@@ -348,7 +348,7 @@ static void printVersion(FILE * file)
 		"-"
 #endif
 		"MONITOR "
-#if defined(WITH_SUPERVISION)
+#if WITH_SUPERVISION
 		"+"
 #else
 		"-"
@@ -370,18 +370,24 @@ static void printVersion(FILE * file)
 		"TRACE "
 
 		"[BINDINGS "
-#if defined(WITH_LEGACY_BINDING_V1)
+#if WITH_LEGACY_BINDING_V1
 		"+"
 #else
 		"-"
 #endif
 		"V1 "
-#if defined(WITH_LEGACY_BINDING_VDYN)
+#if WITH_LEGACY_BINDING_VDYN
 		"+"
 #else
 		"-"
 #endif
-		"VDYN +V2 +V3]\n"
+		"VDYN "
+#if WITH_LEGACY_BINDING_V2
+		"+"
+#else
+		"-"
+#endif
+		"V2 +V3]\n"
 		"\n",
 		AFB_VERSION
 	);
@@ -545,6 +551,7 @@ static int config_has_bool(struct json_object *config, int optid)
 		&& json_object_get_boolean(x);
 }
 
+__attribute__((unused))
 static int config_has_str(struct json_object *config, int optid, const char *val)
 {
 	int i, n;
@@ -814,7 +821,7 @@ static void parse_arguments_inner(int argc, char **argv, struct json_object *con
 			config_set_optstr(config, optid);
 			break;
 
-#if defined(WITH_DBUS_TRANSPARENCY)
+#if WITH_DBUS_TRANSPARENCY
 		case ADD_DBUS_CLIENT:
 		case ADD_DBUS_SERVICE:
 #endif