diff options
author | David 'Digit' Turner <digit@android.com> | 2011-05-09 14:52:14 +0200 |
---|---|---|
committer | David 'Digit' Turner <digit@android.com> | 2011-06-01 17:08:17 +0200 |
commit | 45c3be00d4c1f85ba8bbf34827c024fbc636725f (patch) | |
tree | 1e98c0d75b18f12b0814d60b86eb0a0662cc97d4 /dyngen-exec.h | |
parent | a45e3e024836d7fbfb34d0b62f962a706d1b05fd (diff) | |
download | external_qemu-45c3be00d4c1f85ba8bbf34827c024fbc636725f.zip external_qemu-45c3be00d4c1f85ba8bbf34827c024fbc636725f.tar.gz external_qemu-45c3be00d4c1f85ba8bbf34827c024fbc636725f.tar.bz2 |
integrate: qemu-common.h changes
Change-Id: I4620b4560465ed105202332b59f91b708d91a525
Diffstat (limited to 'dyngen-exec.h')
-rw-r--r-- | dyngen-exec.h | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/dyngen-exec.h b/dyngen-exec.h index 283c286..54fe3d6 100644 --- a/dyngen-exec.h +++ b/dyngen-exec.h @@ -19,19 +19,7 @@ #if !defined(__DYNGEN_EXEC_H__) #define __DYNGEN_EXEC_H__ -/* prevent Solaris from trying to typedef FILE in gcc's - include/floatingpoint.h which will conflict with the - definition down below */ -#ifdef __sun__ -#define _FILEDEFED -#endif - -/* NOTE: standard headers should be used with special care at this - point because host CPU registers are used as global variables. Some - host headers do not allow that. */ -#include <stddef.h> -#include <stdint.h> -#include <stdbool.h> +#include "qemu-common.h" #ifdef __OpenBSD__ #include <sys/types.h> @@ -40,15 +28,6 @@ /* XXX: This may be wrong for 64-bit ILP32 hosts. */ typedef void * host_reg_t; -#ifdef CONFIG_BSD -typedef struct __sFILE FILE; -#else -typedef struct FILE FILE; -#endif -extern int fprintf(FILE *, const char *, ...); -extern int fputs(const char *, FILE *); -extern int printf(const char *, ...); - #if defined(__i386__) #define AREG0 "ebp" #define AREG1 "ebx" |