From f5b98196d524126a125efb9ab097801f05c4be48 Mon Sep 17 00:00:00 2001
From: panne <unknown>
Date: Mon, 24 Jan 2000 16:55:51 +0000
Subject: [PATCH] [project @ 2000-01-24 16:55:45 by panne] Added autoconf
 magic for size/alignment of some more C types

---
 configure.in   |    5 +++++
 mk/config.h.in |   23 +++++++++++++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in
index 349396f..9c69f92 100644
--- a/configure.in
+++ b/configure.in
@@ -537,6 +537,8 @@ AC_STRUCT_ST_BLKSIZE
 
 dnl ** what are the sizes of various types
 dnl    (these must come before GHC_CHECK_ALIGNMENT)
+AC_CHECK_SIZEOF(char,        1)
+AC_CHECK_SIZEOF(int,         4)
 AC_CHECK_SIZEOF(unsigned int,4)
 AC_CHECK_SIZEOF(float,       4)
 AC_CHECK_SIZEOF(double,      8)
@@ -544,6 +546,9 @@ AC_CHECK_SIZEOF(long,        4)
 AC_CHECK_SIZEOF(void *,      4)
 
 dnl ** what are alignment constraints on various types
+FPTOOLS_CHECK_ALIGNMENT(char)
+FPTOOLS_CHECK_ALIGNMENT(int)
+FPTOOLS_CHECK_ALIGNMENT(void *)
 FPTOOLS_CHECK_ALIGNMENT(unsigned int) dnl redundant but harmless
 FPTOOLS_CHECK_ALIGNMENT(long)
 FPTOOLS_CHECK_ALIGNMENT(float)
diff --git a/mk/config.h.in b/mk/config.h.in
index 5b023eb..86c0613 100644
--- a/mk/config.h.in
+++ b/mk/config.h.in
@@ -66,16 +66,25 @@
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 #undef WORDS_BIGENDIAN
 
-/* Define to alignment constraint on doubles or on unsigned int - whichever is the greater */
+/* Define to alignment constraint on characters */
+#undef ALIGNMENT_CHAR
+
+/* Define to alignment constraint on ints */
+#undef ALIGNMENT_INT
+
+/* Define to alignment constraint on void pointers */
+#undef ALIGNMENT_VOID_P
+
+/* 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 doubles */
 #undef ALIGNMENT_LONG
 
-/* Define to alignment constraint on unsigned int - whichever is the greater */
+/* Define to alignment constraint on unsigned int */
 #undef ALIGNMENT_UNSIGNED_INT
 
 /* Define if code lives before data in memory */
@@ -134,6 +143,12 @@
  */
 #define VOID_INT_SIGNALS 0
 
+/* The number of bytes in a char.  */
+#undef SIZEOF_CHAR
+
+/* The number of bytes in a int.  */
+#undef SIZEOF_INT
+
 /* The number of bytes in a double.  */
 #undef SIZEOF_DOUBLE
 
-- 
1.7.10.4