From cef18fc6160f8f5055f2617fbe06eb082c2a7bd5 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Sat, 13 Oct 2012 00:36:12 +0100
Subject: [PATCH] Made extdef.h a global include

---
 CMakeLists.txt             | 1 +
 pv/logicdatasnapshot.cpp   | 2 +-
 pv/logicsignal.cpp         | 4 ++--
 pv/signal.cpp              | 4 ++--
 pv/view/ruler.cpp          | 2 +-
 test/logicdatasnapshot.cpp | 3 ++-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2448a32f..c6459353 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,6 +136,7 @@ add_definitions(${QT_DEFINITIONS})
 
 include_directories(
 	${CMAKE_CURRENT_BINARY_DIR}
+	${CMAKE_CURRENT_SOURCE_DIR}
 	${Boost_INCLUDE_DIRS}
 )
 
diff --git a/pv/logicdatasnapshot.cpp b/pv/logicdatasnapshot.cpp
index 347b7e24..2b3e8cae 100644
--- a/pv/logicdatasnapshot.cpp
+++ b/pv/logicdatasnapshot.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "extdef.h"
+#include <extdef.h>
 
 #include <assert.h>
 #include <string.h>
diff --git a/pv/logicsignal.cpp b/pv/logicsignal.cpp
index 7543f139..fe5572d2 100644
--- a/pv/logicsignal.cpp
+++ b/pv/logicsignal.cpp
@@ -18,9 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <math.h>
+#include <extdef.h>
 
-#include "extdef.h"
+#include <math.h>
 
 #include "logicdata.h"
 #include "logicdatasnapshot.h"
diff --git a/pv/signal.cpp b/pv/signal.cpp
index 92ef808c..282d272b 100644
--- a/pv/signal.cpp
+++ b/pv/signal.cpp
@@ -18,9 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "signal.h"
+#include <extdef.h>
 
-#include "extdef.h"
+#include "signal.h"
 
 namespace pv {
 
diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 84a6a2d7..a2e280b6 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -21,7 +21,7 @@
 #include "ruler.h"
 #include "view.h"
 
-#include "../../extdef.h"
+#include <extdef.h>
 
 #include <assert.h>
 #include <math.h>
diff --git a/test/logicdatasnapshot.cpp b/test/logicdatasnapshot.cpp
index 503b1dda..02d71956 100644
--- a/test/logicdatasnapshot.cpp
+++ b/test/logicdatasnapshot.cpp
@@ -18,12 +18,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <extdef.h>
+
 #define __STDC_LIMIT_MACROS
 #include <stdint.h>
 
 #include <boost/test/unit_test.hpp>
 
-#include "../extdef.h"
 #include "../pv/logicdatasnapshot.h"
 
 using namespace std;
-- 
2.30.2