avoid pt_regs clash

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5 c046a42c-6fe2-441c-8c8c-71466251a162

3 files changed, 6 insertions, 8 deletions

diff --git a/elf.h b/elf.h
index f9108c5364..03f98a348c 100644
--- a/elf.h
+++ b/elf.h
@@ -6,7 +6,7 @@
 
 typedef uint32_t  elf_greg_t;
 
-#define ELF_NGREG (sizeof (struct pt_regs) / sizeof(elf_greg_t))
+#define ELF_NGREG (sizeof (struct target_pt_regs) / sizeof(elf_greg_t))
 typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 
 typedef struct user_i387_struct elf_fpregset_t;
diff --git a/linux-user/main.c b/linux-user/main.c
index e3950835e3..09e22fef29 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -20,8 +20,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
-#include <elf.h>
-#include <endian.h>
 #include <errno.h>
 
 #include "gemu.h"
@@ -210,7 +208,7 @@ void usage(void)
 int main(int argc, char **argv)
 {
     const char *filename;
-    struct pt_regs regs1, *regs = &regs1;
+    struct target_pt_regs regs1, *regs = &regs1;
     struct image_info info1, *info = &info1;
     Interp_ENV *env;
 
@@ -220,12 +218,12 @@ int main(int argc, char **argv)
     filename = argv[1];
 
     /* Zero out regs */
-    memset(regs, 0, sizeof(struct pt_regs));
+    memset(regs, 0, sizeof(struct target_pt_regs));
 
     /* Zero out image_info */
     memset(info, 0, sizeof(struct image_info));
 
-    if(elf_exec(filename, argv+1, __environ, regs, info) != 0) {
+    if(elf_exec(filename, argv+1, environ, regs, info) != 0) {
 	printf("Error loading %s\n", filename);
 	exit(1);
     }
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index fa40d4d845..0b9de6b3fe 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -3,7 +3,7 @@
 
 #include "thunk.h"
 
-struct pt_regs {
+struct target_pt_regs {
 	long ebx;
 	long ecx;
 	long edx;
@@ -44,7 +44,7 @@ struct image_info {
 };
 
 int elf_exec(const char * filename, char ** argv, char ** envp, 
-             struct pt_regs * regs, struct image_info *infop);
+             struct target_pt_regs * regs, struct image_info *infop);
 
 void target_set_brk(char *new_brk);
 void syscall_init(void);