Define __unaligned to nothing on gcc, we don't need it for amd64, and the old definit...

Fix definition of UNALIGNED for amd64.

svn path=/trunk/; revision=43465

diff --git a/reactos/include/crt/_mingw.h b/reactos/include/crt/_mingw.h
index a71b387..3896fd1 100644 (file)
--- a/reactos/include/crt/_mingw.h
+++ b/reactos/include/crt/_mingw.h
@@ -77,7 +77,7 @@
 # define __unaligned
 #else
 # ifdef __GNUC__
-#  define __unaligned __attribute((packed))
+#  define __unaligned
 # elif defined(_MSC_VER) && !defined(_M_IA64) && !defined(_M_AMD64)
 #  define __unaligned
 # else

diff --git a/reactos/include/psdk/winnt.h b/reactos/include/psdk/winnt.h
index 627e3dc..d3772d3 100644 (file)
--- a/reactos/include/psdk/winnt.h
+++ b/reactos/include/psdk/winnt.h
@@ -56,8 +56,9 @@ extern "C" {
 #include <string.h>
 
 /* FIXME: add more architectures. Is there a way to specify this in GCC? */
-#ifdef _X86_
-#define UNALIGNED
+#if defined(_M_AMD64)
+#undef UNALIGNED
+#define UNALIGNED __unaligned
 #else
 #define UNALIGNED
 #endif