From 6a5105a3d2a18c9904152eac6bead6670e048629 Mon Sep 17 00:00:00 2001
From: thomasl <thomasl@eurecom.fr>
Date: Wed, 1 Apr 2015 09:38:26 +0000
Subject: [PATCH] remove USRP #define for UHD as his name exists in
 /usr/include/uhd internals

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6965 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
 targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
index d81e83164b..2fd89394c2 100644
--- a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
+++ b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
@@ -32,6 +32,12 @@
  * Author: HongliangXU : hong-liang-xu@agilent.com
  */
 
+#ifdef USRP
+/* USRP is both an enum in ettus library and a define for OAI */
+/* This removes the define for OAI */
+#undef USRP
+#endif
+
 #include <string.h>
 #include <pthread.h>
 #include <unistd.h>
-- 
GitLab