platform.h move #3

2017-01-21 00:13:21 +11:00
parent f4b375c651
commit fac6a66860
94 changed files with 125 additions and 127 deletions
--- a/qemu/include/elf.h
+++ b/qemu/include/elf.h
@@ -1,7 +1,7 @@
 #ifndef _QEMU_ELF_H
 #define _QEMU_ELF_H

-#include "platform.h"
+#include "unicorn/platform.h"

 /* 32-bit ELF base types. */
 typedef uint32_t Elf32_Addr;
--- a/qemu/include/exec/cpu-defs.h
+++ b/qemu/include/exec/cpu-defs.h
@@ -24,7 +24,7 @@
 #endif

 #include "config.h"
-#include "platform.h"
+#include "unicorn/platform.h"
 #include "qemu/osdep.h"
 #include "qemu/queue.h"
 #ifndef CONFIG_USER_ONLY
--- a/qemu/include/exec/hwaddr.h
+++ b/qemu/include/exec/hwaddr.h
@@ -7,7 +7,7 @@
 /* hwaddr is the type of a physical address (its size can
   be different from 'target_ulong').  */

-#include "platform.h"
+#include "unicorn/platform.h"

 typedef uint64_t hwaddr;
 #define HWADDR_MAX UINT64_MAX
--- a/qemu/include/exec/memory.h
+++ b/qemu/include/exec/memory.h
@@ -19,7 +19,7 @@
 #define DIRTY_MEMORY_CODE      0
 #define DIRTY_MEMORY_NUM       1        /* num of dirty bits */

-#include "platform.h"
+#include "unicorn/platform.h"
 #include "qemu-common.h"
 #include "exec/cpu-common.h"
 #ifndef CONFIG_USER_ONLY
--- a/qemu/include/fpu/softfloat.h
+++ b/qemu/include/fpu/softfloat.h
@@ -42,7 +42,7 @@ these four paragraphs for those parts of this code that are retained.
 #include <sunmath.h>
 #endif

-#include "platform.h"
+#include "unicorn/platform.h"
 #include "config-host.h"
 #include "qemu/osdep.h"

--- a/qemu/include/glib_compat.h
+++ b/qemu/include/glib_compat.h
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #ifndef __GLIB_COMPAT_H
 #define __GLIB_COMPAT_H

-#include "platform.h"
+#include "unicorn/platform.h"
 #include <stdarg.h>
 #include <stdlib.h>
 #include <assert.h>
--- a/qemu/include/qapi/error.h
+++ b/qemu/include/qapi/error.h
@@ -14,7 +14,7 @@

 #include "qemu/compiler.h"
 #include "qapi-types.h"
-#include "platform.h"
+#include "unicorn/platform.h"

 /**
 * A class representing internal errors within QEMU.  An error has a ErrorClass
--- a/qemu/include/qapi/qmp/qbool.h
+++ b/qemu/include/qapi/qmp/qbool.h
@@ -14,7 +14,7 @@
 #ifndef QBOOL_H
 #define QBOOL_H

-#include "platform.h"
+#include "unicorn/platform.h"
 #include "qapi/qmp/qobject.h"

 typedef struct QBool {
--- a/qemu/include/qapi/qmp/qdict.h
+++ b/qemu/include/qapi/qmp/qdict.h
@@ -16,7 +16,7 @@
 #include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qlist.h"
 #include "qemu/queue.h"
-#include "platform.h"
+#include "unicorn/platform.h"

 #define QDICT_BUCKET_MAX 512

--- a/qemu/include/qapi/qmp/qfloat.h
+++ b/qemu/include/qapi/qmp/qfloat.h
@@ -14,7 +14,7 @@
 #ifndef QFLOAT_H
 #define QFLOAT_H

-#include "platform.h"
+#include "unicorn/platform.h"
 #include "qapi/qmp/qobject.h"

 typedef struct QFloat {
--- a/qemu/include/qapi/qmp/qint.h
+++ b/qemu/include/qapi/qmp/qint.h
@@ -13,7 +13,7 @@
 #ifndef QINT_H
 #define QINT_H

-#include "platform.h"
+#include "unicorn/platform.h"
 #include "qapi/qmp/qobject.h"

 typedef struct QInt {
--- a/qemu/include/qapi/qmp/qstring.h
+++ b/qemu/include/qapi/qmp/qstring.h
@@ -13,7 +13,7 @@
 #ifndef QSTRING_H
 #define QSTRING_H

-#include "platform.h"
+#include "unicorn/platform.h"
 #include "qapi/qmp/qobject.h"

 typedef struct QString {
--- a/qemu/include/qemu-common.h
+++ b/qemu/include/qemu-common.h
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <string.h>
 #include <limits.h>
 #include <time.h>
--- a/qemu/include/qemu/bitops.h
+++ b/qemu/include/qemu/bitops.h
@@ -12,7 +12,7 @@
 #ifndef BITOPS_H
 #define BITOPS_H

-#include "platform.h"
+#include "unicorn/platform.h"
 #include <assert.h>

 #include "host-utils.h"
--- a/qemu/include/qemu/bswap.h
+++ b/qemu/include/qemu/bswap.h
@@ -2,7 +2,7 @@
 #define BSWAP_H

 #include "config-host.h"
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <limits.h>
 #include <string.h>
 #include "fpu/softfloat.h"
--- a/qemu/include/qemu/int128.h
+++ b/qemu/include/qemu/int128.h
@@ -2,7 +2,7 @@
 #define INT128_H

 //#include <assert.h>
-#include "platform.h"
+#include "unicorn/platform.h"

 typedef struct Int128 Int128;

--- a/qemu/include/qemu/log.h
+++ b/qemu/include/qemu/log.h
@@ -2,7 +2,7 @@
 #define QEMU_LOG_H

 #include <stdarg.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include "qemu/compiler.h"
 #include "qom/cpu.h"

--- a/qemu/include/qemu/osdep.h
+++ b/qemu/include/qemu/osdep.h
@@ -4,7 +4,7 @@
 #include "config-host.h"
 #include <stdarg.h>
 #include <stddef.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <sys/types.h>
 #ifdef __OpenBSD__
 #include <sys/signal.h>
@@ -17,7 +17,7 @@
 #define WEXITSTATUS(x) (x)
 #endif

-#include "platform.h"
+#include "unicorn/platform.h"

 #if defined(CONFIG_SOLARIS) && CONFIG_SOLARIS_VERSION < 10
 /* [u]int_fast*_t not in <sys/int_types.h> */
--- a/qemu/include/qemu/range.h
+++ b/qemu/include/qemu/range.h
@@ -1,7 +1,7 @@
 #ifndef QEMU_RANGE_H
 #define QEMU_RANGE_H

-#include "platform.h"
+#include "unicorn/platform.h"
 #include <qemu/typedefs.h>
 #include "qemu/queue.h"

--- a/qemu/include/qemu/thread.h
+++ b/qemu/include/qemu/thread.h
@@ -1,7 +1,7 @@
 #ifndef __QEMU_THREAD_H
 #define __QEMU_THREAD_H 1

-#include "platform.h"
+#include "unicorn/platform.h"

 typedef struct QemuThread QemuThread;

--- a/qemu/include/qom/object.h
+++ b/qemu/include/qom/object.h
@@ -15,7 +15,7 @@
 #define QEMU_OBJECT_H

 #include "glib_compat.h"
-#include "platform.h"
+#include "unicorn/platform.h"
 #include "qemu/queue.h"
 #include "qapi/error.h"