Replaced architecture-dependent configure checks by hardcoded
definitions in winnt.h (to avoid config.h dependency).
diff --git a/include/acconfig.h b/include/acconfig.h
index 91b3d56..66a8603 100644
--- a/include/acconfig.h
+++ b/include/acconfig.h
@@ -3,12 +3,6 @@
* defined in the 'configure' script.
*/
-/* Define if bitfields are bigendian */
-#undef BITFIELDS_BIGENDIAN
-
-/* Define if unaligned memory access is allowed */
-#undef ALLOW_UNALIGNED_ACCESS
-
/* Define if .type asm directive must be inside a .def directive */
#undef NEED_TYPE_IN_DEF
diff --git a/include/config.h.in b/include/config.h.in
index 27c2df3..5e9ec88 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -37,22 +37,12 @@
/* Define if you have the ANSI C header files. */
#undef STDC_HEADERS
-/* Define if your processor stores words with the most significant
- byte first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
-
/* Define if the X Window System is missing or not being used. */
#undef X_DISPLAY_MISSING
/* Define if lex declares yytext as a char * by default, not a char[]. */
#undef YYTEXT_POINTER
-/* Define if bitfields are bigendian */
-#undef BITFIELDS_BIGENDIAN
-
-/* Define if unaligned memory access is allowed */
-#undef ALLOW_UNALIGNED_ACCESS
-
/* Define if .type asm directive must be inside a .def directive */
#undef NEED_TYPE_IN_DEF
diff --git a/include/wine/port.h b/include/wine/port.h
index 6a1ae5f..de6d588 100644
--- a/include/wine/port.h
+++ b/include/wine/port.h
@@ -7,6 +7,7 @@
#define __WINE_WINE_PORT_H
#include "config.h"
+#include "winnt.h"
#include <sys/types.h>
#include <sys/time.h>
diff --git a/include/winnt.h b/include/winnt.h
index 96ae5ed..9aba207 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -27,6 +27,21 @@
/**** Some Wine specific definitions *****/
+/* Architecture dependent settings. */
+/* These are hardcoded to avoid dependencies on config.h in Winelib apps. */
+#if defined(__i386__)
+# undef WORDS_BIGENDIAN
+# undef BITFIELDS_BIGENDIAN
+# define ALLOW_UNALIGNED_ACCESS
+#elif defined(__sparc__)
+# define WORDS_BIGENDIAN
+# define BITFIELDS_BIGENDIAN
+# undef ALLOW_UNALIGNED_ACCESS
+#elif !defined(RC_INVOKED)
+# error Unknown CPU architecture!
+#endif
+
+
/* Calling conventions definitions */
#ifdef __i386__
