projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6a6772b
)
Made extdef.h a global include
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Fri, 12 Oct 2012 23:36:12 +0000
(
00:36
+0100)
committer
Uwe Hermann
<uwe@hermann-uwe.de>
Sat, 13 Oct 2012 13:02:58 +0000
(15:02 +0200)
CMakeLists.txt
patch
|
blob
|
history
pv/logicdatasnapshot.cpp
patch
|
blob
|
history
pv/logicsignal.cpp
patch
|
blob
|
history
pv/signal.cpp
patch
|
blob
|
history
pv/view/ruler.cpp
patch
|
blob
|
history
test/logicdatasnapshot.cpp
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 2448a32f3e00229897925fac339ef90bfe479586..c6459353b62a63f19e757e10e93075961217cd6a 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-136,6
+136,7
@@
add_definitions(${QT_DEFINITIONS})
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
${Boost_INCLUDE_DIRS}
)
${Boost_INCLUDE_DIRS}
)
diff --git
a/pv/logicdatasnapshot.cpp
b/pv/logicdatasnapshot.cpp
index 347b7e2445d71678a94b3151d41e4ef6fdb8936d..2b3e8cae7c06b4e8c3e125a941d2d2cb865c5f4c 100644
(file)
--- a/
pv/logicdatasnapshot.cpp
+++ b/
pv/logicdatasnapshot.cpp
@@
-18,7
+18,7
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include
"extdef.h"
+#include
<extdef.h>
#include <assert.h>
#include <string.h>
#include <assert.h>
#include <string.h>
diff --git
a/pv/logicsignal.cpp
b/pv/logicsignal.cpp
index 7543f1396e233003f58ff2c4a4f6131c3b3b6a1b..fe5572d232d8184ebb25807c0bdc4b9755022232 100644
(file)
--- a/
pv/logicsignal.cpp
+++ b/
pv/logicsignal.cpp
@@
-18,9
+18,9
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* 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"
#include "logicdata.h"
#include "logicdatasnapshot.h"
diff --git
a/pv/signal.cpp
b/pv/signal.cpp
index 92ef808c2bdc29c3a620cf72cadd22293cab6dac..282d272bf7df3395287fd6e5e5b127b022cfdca1 100644
(file)
--- a/
pv/signal.cpp
+++ b/
pv/signal.cpp
@@
-18,9
+18,9
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* 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 {
namespace pv {
diff --git
a/pv/view/ruler.cpp
b/pv/view/ruler.cpp
index 84a6a2d736afd250cb22bf6bda4d7f3e2135a24c..a2e280b6f2291cd57ac11ce65403fb1dac9fd99b 100644
(file)
--- a/
pv/view/ruler.cpp
+++ b/
pv/view/ruler.cpp
@@
-21,7
+21,7
@@
#include "ruler.h"
#include "view.h"
#include "ruler.h"
#include "view.h"
-#include
"../../extdef.h"
+#include
<extdef.h>
#include <assert.h>
#include <math.h>
#include <assert.h>
#include <math.h>
diff --git
a/test/logicdatasnapshot.cpp
b/test/logicdatasnapshot.cpp
index 503b1dda7176e6c2e3851dd62d409cf978260a23..02d719566e34a54295f3c34aeb1868204e055c33 100644
(file)
--- a/
test/logicdatasnapshot.cpp
+++ b/
test/logicdatasnapshot.cpp
@@
-18,12
+18,13
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* 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>
#define __STDC_LIMIT_MACROS
#include <stdint.h>
#include <boost/test/unit_test.hpp>
-#include "../extdef.h"
#include "../pv/logicdatasnapshot.h"
using namespace std;
#include "../pv/logicdatasnapshot.h"
using namespace std;