From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Wed, 24 Sep 2014 16:05:46 +0000 (+0200)
Subject: avoid #macro in code
X-Git-Tag: v1.2.0~133
X-Git-Url: http://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=b50653aecc1a70ba5196bc37c31d154fdbdecf34

avoid #macro in code
---

diff --git a/src/lib/amd.h b/src/lib/amd.h
index 9cca6d2..ef77c26 100644
--- a/src/lib/amd.h
+++ b/src/lib/amd.h
@@ -20,12 +20,25 @@
 #ifndef _PSENSOR_AMD_H_
 #define _PSENSOR_AMD_H_
 
+#include <bool.h>
 #include <psensor.h>
 
-void amd_psensor_list_update(struct psensor **sensors);
+#if defined(HAVE_LIBATIADL) && HAVE_LIBATIADL
 
-void amd_psensor_list_append(struct psensor ***sensors, int values_max_length);
+static inline bool amd_is_supported(void) { return true; }
 
+void amd_psensor_list_update(struct psensor **s);
+void amd_psensor_list_append(struct psensor ***s, int n);
 void amd_cleanup(void);
 
+#else
+
+static inline bool amd_is_supported(void) { return false; }
+
+static inline void amd_psensor_list_update(struct psensor **s) {}
+static inline void amd_psensor_list_append(struct psensor ***s, int n) {}
+static inline void amd_cleanup(void) {}
+
+#endif
+
 #endif
diff --git a/src/ui_pref.c b/src/ui_pref.c
index 1eda597..9be3c8c 100644
--- a/src/ui_pref.c
+++ b/src/ui_pref.c
@@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <amd.h>
 #include <ui.h>
 #include <cfg.h>
 #include <graph.h>
@@ -202,12 +203,13 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 	w_atiadlsdk
 		= GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,
 							   "atiadlsdk"));
-#if !HAVE_LIBATIADL
-	gtk_widget_set_sensitive(GTK_WIDGET(w_atiadlsdk), 0);
-	gtk_widget_set_has_tooltip(GTK_WIDGET(w_atiadlsdk), TRUE);
-#else
-	gtk_widget_set_has_tooltip(GTK_WIDGET(w_atiadlsdk), FALSE);
-#endif
+	if (!amd_is_supported()) {
+		gtk_widget_set_has_tooltip(GTK_WIDGET(w_atiadlsdk), FALSE);
+	} else {
+		gtk_widget_set_sensitive(GTK_WIDGET(w_atiadlsdk), 0);
+		gtk_widget_set_has_tooltip(GTK_WIDGET(w_atiadlsdk), TRUE);
+	}
+
 	gtk_toggle_button_set_active(w_atiadlsdk,
 				     config_is_atiadlsdk_enabled());