win32 qcow fix

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

diff --git a/Makefile b/Makefile
index c431acd18fe1fc4fa7af257c1b7eba6240195d2a..3659819fbe9254fd03e80c4a111a291b366ce7f6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,6 @@ CFLAGS=-Wall -O2 -g -fno-strict-aliasing
 ifdef CONFIG_DARWIN
 CFLAGS+= -mdynamic-no-pic
 endif
-ifdef CONFIG_WIN32
-CFLAGS+=-fpack-struct 
-endif
 LDFLAGS=-g
 LIBS=
 DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE

diff --git a/a.out.h b/a.out.h
index 500e14f3fcabdb855fc09ceb5f565a3da7eef2e0..1f978c1c044a293f665c93f329e4b05ae78abe1f 100644 (file)
--- a/a.out.h
+++ b/a.out.h
@@ -151,7 +151,7 @@ struct external_lineno {
 #define E_FILNMLEN     14      /* # characters in a file name          */
 #define E_DIMNUM       4       /* # array dimensions in auxiliary entry */
 
-struct external_syment
+struct __attribute__((packed)) external_syment
 {
   union {
     char e_name[E_SYMNMLEN];