Fix keystone include path to use the internal keystone

irdb-libs/libIRDB-core/src/SConscript

@@ -50,7 +50,7 @@ cpppath='''
 	$SECURITY_TRANSFORMS_HOME/include/
 	$SECURITY_TRANSFORMS_HOME/libIRDB-core/include/
 	$SECURITY_TRANSFORMS_HOME/third_party/capstone/include/capstone/
-	$SECURITY_TRANSFORMS_HOME/third_party/keystone/include/keystone/
+	$SECURITY_TRANSFORMS_HOME/third_party/keystone/include/
 	'''
 libpath='''
 	$SECURITY_TRANSFORMS_HOME/lib

irdb-libs/libIRDB-core/src/address.cpp

@@ -26,25 +26,13 @@
 using namespace libIRDB;
 using namespace std;
 
-
 vector<string> AddressID_t::WriteToDB(File_t *fid, db_id_t newid, bool p_withHeader)
 {
         assert(fid);
 	
-	if(getBaseID()==NOT_IN_DATABASE)
+	if(getBaseID() == NOT_IN_DATABASE)
 		setBaseID(newid);
 
-/*
-	string q;
-	if (p_withHeader)
-        q=string("insert into ")+fid->address_table_name + 
-			string("(address_id , file_id , vaddress_offset , doip_id)") +
-			string(" values ");
-	else
-		q = ",";
-			
-	q +=
-*/
 	return {
 		to_string(getBaseID()),
 		to_string(fileID),

irdb-libs/libIRDB-core/src/fileir.cpp

@@ -19,7 +19,7 @@
  *
  */
 
-#include <keystone.h>
+#include <keystone/keystone.h>
 #include <all.hpp>
 #include <irdb-util>
 #include <cstdlib>

irdb-libs/libIRDB-core/src/instruction.cpp

@@ -25,7 +25,7 @@
 #include <sstream>
 #include <iomanip>
 #include <irdb-util>
-#include <keystone.h>
+#include <keystone/keystone.h>
 #include "cmdstr.hpp"
 
 #undef EIP