From: panne <unknown>
Date: Wed, 26 Jan 2000 10:44:13 +0000 (+0000)
Subject: [project @ 2000-01-26 10:44:07 by panne]
X-Git-Tag: Approximately_9120_patches~5194
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=39adb269115e9776b1dfc159b53624bdef881005

[project @ 2000-01-26 10:44:07 by panne]
Sven's first autoheader commandment: Don't change config.h.in manually...!
(Why is mk/config.h.in in the repository? configure is not, either.)
---

diff --git a/acconfig.h b/acconfig.h
index 691d3c5..5364127 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -15,18 +15,45 @@
 
 @TOP@
 
-/* Define to alignment constraint on doubles or on unsigned int - whichever is the greater */
+/* Define to alignment constraint on chars */
+#undef ALIGNMENT_CHAR
+
+/* Define to alignment constraint on doubles */
 #undef ALIGNMENT_DOUBLE
 
-/* Define to alignment constraint on floats or on unsigned int - whichever is the greater */
+/* Define to alignment constraint on floats */
 #undef ALIGNMENT_FLOAT
 
-/* Define to alignment constraint on doubles or on unsigned int - whichever is the greater */
+/* Define to alignment constraint on ints */
+#undef ALIGNMENT_INT
+
+/* Define to alignment constraint on longs */
 #undef ALIGNMENT_LONG
 
-/* Define to alignment constraint on unsigned int - whichever is the greater */
+/* Define to alignment constraint on long longs */
+#undef ALIGNMENT_LONG_LONG
+
+/* Define to alignment constraint on shorts */
+#undef ALIGNMENT_SHORT
+
+/* Define to alignment constraint on unsigned chars */
+#undef ALIGNMENT_UNSIGNED_CHAR
+
+/* Define to alignment constraint on unsigned ints */
 #undef ALIGNMENT_UNSIGNED_INT
 
+/* Define to alignment constraint on unsigned longs */
+#undef ALIGNMENT_UNSIGNED_LONG
+
+/* Define to alignment constraint on unsigned long longs */
+#undef ALIGNMENT_UNSIGNED_LONG_LONG
+
+/* Define to alignment constraint on unsigned shorts */
+#undef ALIGNMENT_UNSIGNED_SHORT
+
+/* Define to alignment constraint on void pointers */
+#undef ALIGNMENT_VOID_P
+
 /* Define if code lives before data in memory */
 #undef CODE_BEFORE_DATA
 
diff --git a/configure.in b/configure.in
index 08e2f18..e886007 100644
--- a/configure.in
+++ b/configure.in
@@ -541,36 +541,40 @@ FPTOOLS_C_LONG_LONG
 dnl ** what are the sizes of various types
 dnl    (these must come before GHC_CHECK_ALIGNMENT)
 AC_CHECK_SIZEOF(char,               1)
-AC_CHECK_SIZEOF(unsigned char,      1)
-AC_CHECK_SIZEOF(short,              2)
-AC_CHECK_SIZEOF(unsigned short,     2)
+AC_CHECK_SIZEOF(double,             8)
+AC_CHECK_SIZEOF(float,              4)
 AC_CHECK_SIZEOF(int,                4)
-AC_CHECK_SIZEOF(unsigned int,       4)
 AC_CHECK_SIZEOF(long,               4)
-AC_CHECK_SIZEOF(unsigned long,      4)
 if test "$fptools_cv_have_long_long" = yes; then
 AC_CHECK_SIZEOF(long long,          8)
+fi
+AC_CHECK_SIZEOF(short,              2)
+AC_CHECK_SIZEOF(unsigned char,      1)
+AC_CHECK_SIZEOF(unsigned int,       4)
+AC_CHECK_SIZEOF(unsigned long,      4)
+if test "$fptools_cv_have_long_long" = yes; then
 AC_CHECK_SIZEOF(unsigned long long, 8)
 fi
-AC_CHECK_SIZEOF(float,              4)
-AC_CHECK_SIZEOF(double,             8)
+AC_CHECK_SIZEOF(unsigned short,     2)
 AC_CHECK_SIZEOF(void *,             4)
 
 dnl ** what are alignment constraints on various types
 FPTOOLS_CHECK_ALIGNMENT(char)
-FPTOOLS_CHECK_ALIGNMENT(unsigned char)
-FPTOOLS_CHECK_ALIGNMENT(short)
-FPTOOLS_CHECK_ALIGNMENT(unsigned short)
+FPTOOLS_CHECK_ALIGNMENT(double)
+FPTOOLS_CHECK_ALIGNMENT(float)
 FPTOOLS_CHECK_ALIGNMENT(int)
-FPTOOLS_CHECK_ALIGNMENT(unsigned int)
 FPTOOLS_CHECK_ALIGNMENT(long)
-FPTOOLS_CHECK_ALIGNMENT(unsigned long)
 if test "$fptools_cv_have_long_long" = yes; then
 FPTOOLS_CHECK_ALIGNMENT(long long)
+fi
+FPTOOLS_CHECK_ALIGNMENT(short)
+FPTOOLS_CHECK_ALIGNMENT(unsigned char)
+FPTOOLS_CHECK_ALIGNMENT(unsigned int)
+FPTOOLS_CHECK_ALIGNMENT(unsigned long)
+if test "$fptools_cv_have_long_long" = yes; then
 FPTOOLS_CHECK_ALIGNMENT(unsigned long long)
 fi
-FPTOOLS_CHECK_ALIGNMENT(float)
-FPTOOLS_CHECK_ALIGNMENT(double)
+FPTOOLS_CHECK_ALIGNMENT(unsigned short)
 FPTOOLS_CHECK_ALIGNMENT(void *)
 
 dnl ** can we open files in binary mode?
diff --git a/mk/config.h.in b/mk/config.h.in
index 7ff942b..5506409 100644
--- a/mk/config.h.in
+++ b/mk/config.h.in
@@ -69,38 +69,38 @@
 /* Define to alignment constraint on chars */
 #undef ALIGNMENT_CHAR
 
-/* Define to alignment constraint on unsigned chars */
-#undef ALIGNMENT_UNSIGNED_CHAR
-
-/* Define to alignment constraint on shorts */
-#undef ALIGNMENT_SHORT
+/* Define to alignment constraint on doubles */
+#undef ALIGNMENT_DOUBLE
 
-/* Define to alignment constraint on unsigned shorts */
-#undef ALIGNMENT_UNSIGNED_SHORT
+/* Define to alignment constraint on floats */
+#undef ALIGNMENT_FLOAT
 
 /* Define to alignment constraint on ints */
 #undef ALIGNMENT_INT
 
-/* Define to alignment constraint on unsigned ints */
-#undef ALIGNMENT_UNSIGNED_INT
-
 /* Define to alignment constraint on longs */
 #undef ALIGNMENT_LONG
 
-/* Define to alignment constraint on unsigned longs */
-#undef ALIGNMENT_UNSIGNED_LONG
-
 /* Define to alignment constraint on long longs */
 #undef ALIGNMENT_LONG_LONG
 
+/* Define to alignment constraint on shorts */
+#undef ALIGNMENT_SHORT
+
+/* Define to alignment constraint on unsigned chars */
+#undef ALIGNMENT_UNSIGNED_CHAR
+
+/* Define to alignment constraint on unsigned ints */
+#undef ALIGNMENT_UNSIGNED_INT
+
+/* Define to alignment constraint on unsigned longs */
+#undef ALIGNMENT_UNSIGNED_LONG
+
 /* Define to alignment constraint on unsigned long longs */
 #undef ALIGNMENT_UNSIGNED_LONG_LONG
 
-/* Define to alignment constraint on doubles */
-#undef ALIGNMENT_DOUBLE
-
-/* Define to alignment constraint on floats */
-#undef ALIGNMENT_FLOAT
+/* Define to alignment constraint on unsigned shorts */
+#undef ALIGNMENT_UNSIGNED_SHORT
 
 /* Define to alignment constraint on void pointers */
 #undef ALIGNMENT_VOID_P
@@ -164,38 +164,38 @@
 /* The number of bytes in a char.  */
 #undef SIZEOF_CHAR
 
-/* The number of bytes in an unsigned char.  */
-#undef SIZEOF_UNSIGNED_CHAR
-
-/* The number of bytes in a short.  */
-#undef SIZEOF_SHORT
+/* The number of bytes in a double.  */
+#undef SIZEOF_DOUBLE
 
-/* The number of bytes in an unsigned short.  */
-#undef SIZEOF_UNSIGNED_SHORT
+/* The number of bytes in a float.  */
+#undef SIZEOF_FLOAT
 
 /* The number of bytes in a int.  */
 #undef SIZEOF_INT
 
-/* The number of bytes in an unsigned int.  */
-#undef SIZEOF_UNSIGNED_INT
-
 /* The number of bytes in a long.  */
 #undef SIZEOF_LONG
 
-/* The number of bytes in an unsigned long.  */
-#undef SIZEOF_UNSIGNED_LONG
-
 /* The number of bytes in a long long.  */
 #undef SIZEOF_LONG_LONG
 
-/* The number of bytes in an unsigned long long.  */
-#undef SIZEOF_UNSIGNED_LONG_LONG
+/* The number of bytes in a short.  */
+#undef SIZEOF_SHORT
 
-/* The number of bytes in a double.  */
-#undef SIZEOF_DOUBLE
+/* The number of bytes in a unsigned char.  */
+#undef SIZEOF_UNSIGNED_CHAR
 
-/* The number of bytes in a float.  */
-#undef SIZEOF_FLOAT
+/* The number of bytes in a unsigned int.  */
+#undef SIZEOF_UNSIGNED_INT
+
+/* The number of bytes in a unsigned long.  */
+#undef SIZEOF_UNSIGNED_LONG
+
+/* The number of bytes in a unsigned long long.  */
+#undef SIZEOF_UNSIGNED_LONG_LONG
+
+/* The number of bytes in a unsigned short.  */
+#undef SIZEOF_UNSIGNED_SHORT
 
 /* The number of bytes in a void *.  */
 #undef SIZEOF_VOID_P