From 579c6354514d57d3f1881131203ba6bbd9648816 Mon Sep 17 00:00:00 2001
From: ttsou
Date: Mon, 14 Sep 2009 19:50:26 -0400
Subject: Removed preprocessor declrs out of fusb.h and created separate
 fusb_libusb1_base.h

---
 usrp/host/lib/usrp_basic_common.cc | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'usrp/host/lib/usrp_basic_common.cc')

diff --git a/usrp/host/lib/usrp_basic_common.cc b/usrp/host/lib/usrp_basic_common.cc
index ad1eca56d..9a1f9fd55 100644
--- a/usrp/host/lib/usrp_basic_common.cc
+++ b/usrp/host/lib/usrp_basic_common.cc
@@ -20,16 +20,23 @@
  * Boston, MA 02110-1301, USA.
  */
 
-//#ifdef HAVE_CONFIG_H
-//#include "config.h"
-//#endif
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_LIBUSB_1
+#include "fusb_libusb1_base.h"
+#include <libusb-1.0/libusb.h>
+#else
+#include "fusb.h"
+#include <usb.h>
+#endif
 
 #include "usrp/usrp_basic.h"
 #include "usrp/usrp_prims.h"
 #include "usrp_interfaces.h"
 #include "fpga_regs_common.h"
 #include "fpga_regs_standard.h"
-#include "fusb.h"
 #include "db_boards.h"
 #include <stdexcept>
 #include <assert.h>
@@ -38,12 +45,6 @@
 #include <string.h>
 #include <cstdio>
 
-#ifdef HAVE_LIBUSB_1
-#include <libusb-1.0/libusb.h>
-#else
-#include <usb.h>
-#endif
-
 using namespace ad9862;
 
 #define NELEM(x) (sizeof (x) / sizeof (x[0]))
-- 
cgit