From: Bert Vermeulen <redacted>
Date: Sat, 15 Sep 2012 16:28:43 +0000 (+0200)
Subject: fluke-dmm: build fixes
X-Git-Tag: dsupstream~690
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=e7edd64f4573b786a8a1ab00e837d9e56cc69480;p=libsigrok.git

fluke-dmm: build fixes
---

diff --git a/hardware/fluke-dmm/api.c b/hardware/fluke-dmm/api.c
index b93b37fa..cec9f3ef 100644
--- a/hardware/fluke-dmm/api.c
+++ b/hardware/fluke-dmm/api.c
@@ -29,8 +29,8 @@
 #include <errno.h>
 
 
-SR_PRIV struct sr_dev_driver driver_info;
-static struct sr_dev_driver *di = &driver_info;
+SR_PRIV struct sr_dev_driver flukedmm_driver_info;
+static struct sr_dev_driver *di = &flukedmm_driver_info;
 
 static const struct flukedmm_profile supported_flukedmm[] = {
 	{ FLUKE_187, "187" },
@@ -307,7 +307,7 @@ static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
 	return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver driver_info = {
+SR_PRIV struct sr_dev_driver flukedmm_driver_info = {
 	.name = "fluke-dmm",
 	.longname = "Fluke 18x/28x series DMMs",
 	.api_version = 1,
diff --git a/hwdriver.c b/hwdriver.c
index e466575b..083504c5 100644
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -86,6 +86,9 @@ extern SR_PRIV struct sr_dev_driver genericdmm_driver_info;
 #ifdef HAVE_HW_AGILENT_DMM
 extern SR_PRIV struct sr_dev_driver agdmm_driver_info;
 #endif
+#ifdef HAVE_HW_FLUKE_DMM
+extern SR_PRIV struct sr_dev_driver flukedmm_driver_info;
+#endif
 
 static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_LA_DEMO
@@ -120,6 +123,9 @@ static struct sr_dev_driver *drivers_list[] = {
 #endif
 #ifdef HAVE_HW_AGILENT_DMM
 	&agdmm_driver_info,
+#endif
+#ifdef HAVE_HW_FLUKE_DMM
+	&flukedmm_driver_info,
 #endif
 	NULL,
 };