From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 30 Aug 2013 15:23:22 +0000 (+0100)
Subject: Fix unused function when SELinux is not enabled
X-Git-Tag: dbus-1.7.6~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b119fc4a142c467c6ca3f075596b03f6a00f957d;p=thirdparty%2Fdbus.git

Fix unused function when SELinux is not enabled

It must be one of the "only smcv tests this" configurations...
---

diff --git a/bus/selinux.c b/bus/selinux.c
index 57c943264..c36c94ecf 100644
--- a/bus/selinux.c
+++ b/bus/selinux.c
@@ -959,10 +959,11 @@ bus_selinux_id_table_print (DBusHashTable *service_table)
 /**
  * Print out some AVC statistics.
  */
+#ifdef HAVE_SELINUX
 static void
 bus_avc_print_stats (void)
 {
-#if defined (DBUS_ENABLE_VERBOSE_MODE) && defined (HAVE_SELINUX)
+#ifdef DBUS_ENABLE_VERBOSE_MODE
   struct avc_cache_stats cstats;
 
   if (!selinux_enabled)
@@ -980,9 +981,9 @@ bus_avc_print_stats (void)
   _dbus_verbose ("CAV hits: %d\n", cstats.cav_hits);
   _dbus_verbose ("CAV probes: %d\n", cstats.cav_probes);
   _dbus_verbose ("CAV misses: %d\n", cstats.cav_misses);
-#endif /* DBUS_ENABLE_VERBOSE_MODE && HAVE_SELINUX */
+#endif /* DBUS_ENABLE_VERBOSE_MODE */
 }
-
+#endif /* HAVE_SELINUX */
 
 /**
  * Destroy the AVC before we terminate.