Fedora patches

geohot · Jun 10, 2009 · e503783 · e503783
1 parent d8725a0
commit e503783
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 5 deletions.
diff --git a/Changelist.cc b/Changelist.cc
@@ -8,8 +8,6 @@
 #include <iostream>
 #include <iomanip>
 
-#include "data_atomic.h"
-
 #include "data.h"
 
 namespace eda {

diff --git a/FactoryOwner.cc b/FactoryOwner.cc
@@ -20,6 +20,7 @@
 
 #include <iomanip>
 
+#include "data.h"
 #include "debug.h"
 
 #include "util.h"

diff --git a/File.cc b/File.cc
@@ -3,6 +3,9 @@
 // part of "The Embedded Disassembler"
 //  released under GPLv3, see http://gplv3.fsf.org/
 
+#include <cstdio>
+
+#include "data.h"
 #include "File.h"
 #include "util.h"
 

diff --git a/History.cc b/History.cc
@@ -8,8 +8,8 @@
 // modified_ maps Addresses to changelists that changed them
 // I could map right to changelists themselves, but the numbers way is cleaner
 
-#include "util.h"
 #include "data.h"
+#include "util.h"
 
 using namespace eda;
 

diff --git a/ParsedInstruction.cc b/ParsedInstruction.cc
@@ -3,7 +3,7 @@
 // part of "The Embedded Disassembler"
 //  released under GPLv3, see http://gplv3.fsf.org/
 
-#include "data_atomic.h"
+#include "data.h"
 
 #include <map>
 #include <string>

diff --git a/data.h b/data.h
@@ -9,6 +9,12 @@
 #ifndef EDA_DATA_H_
 #define EDA_DATA_H_
 
+#ifdef __linux
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned int uint32_t;
+#endif
+
 #include <map>
 #include <set>
 

diff --git a/debug.cc b/debug.cc
@@ -5,6 +5,7 @@
 //
 // Various functions to assist debugging
 
+#include "data.h"
 #include "debug.h"
 
 #include <iostream>

diff --git a/util.cc b/util.cc
@@ -3,12 +3,13 @@
 // part of "The Embedded Disassembler"
 //  released under GPLv3, see http://gplv3.fsf.org/
 
+#include <cstdio>
 #include <string>
 #include <sstream>
 #include <iomanip>
 
-#include "util.h"
 #include "data.h"
+#include "util.h"
 
 using namespace std;
 using namespace eda;