Un-conditionalize and require a 64-bit integer type.

* configure.in: Un-conditionalize and require a 64-bit integer
type.

diff --git a/ChangeLog b/ChangeLog
index edfde91..d31cd63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 10 17:34:15 2001  Joshua N Pritikin  <vishnu@pobox.com>
+
+       * configure.in: Un-conditionalize and require a 64-bit integer
+       type.
+
 2001-10-04  Raja R Harinath  <harinath@cs.umn.edu>
 
        * configure.in: Avoid 'test -a'.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index edfde91..d31cd63 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Wed Oct 10 17:34:15 2001  Joshua N Pritikin  <vishnu@pobox.com>
+
+       * configure.in: Un-conditionalize and require a 64-bit integer
+       type.
+
 2001-10-04  Raja R Harinath  <harinath@cs.umn.edu>
 
        * configure.in: Avoid 'test -a'.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index edfde91..d31cd63 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed Oct 10 17:34:15 2001  Joshua N Pritikin  <vishnu@pobox.com>
+
+       * configure.in: Un-conditionalize and require a 64-bit integer
+       type.
+
 2001-10-04  Raja R Harinath  <harinath@cs.umn.edu>
 
        * configure.in: Avoid 'test -a'.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index edfde91..d31cd63 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Wed Oct 10 17:34:15 2001  Joshua N Pritikin  <vishnu@pobox.com>
+
+       * configure.in: Un-conditionalize and require a 64-bit integer
+       type.
+
 2001-10-04  Raja R Harinath  <harinath@cs.umn.edu>
 
        * configure.in: Avoid 'test -a'.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index edfde91..d31cd63 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Wed Oct 10 17:34:15 2001  Joshua N Pritikin  <vishnu@pobox.com>
+
+       * configure.in: Un-conditionalize and require a 64-bit integer
+       type.
+
 2001-10-04  Raja R Harinath  <harinath@cs.umn.edu>
 
        * configure.in: Avoid 'test -a'.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index edfde91..d31cd63 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Wed Oct 10 17:34:15 2001  Joshua N Pritikin  <vishnu@pobox.com>
+
+       * configure.in: Un-conditionalize and require a 64-bit integer
+       type.
+
 2001-10-04  Raja R Harinath  <harinath@cs.umn.edu>
 
        * configure.in: Avoid 'test -a'.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index edfde91..d31cd63 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed Oct 10 17:34:15 2001  Joshua N Pritikin  <vishnu@pobox.com>
+
+       * configure.in: Un-conditionalize and require a 64-bit integer
+       type.
+
 2001-10-04  Raja R Harinath  <harinath@cs.umn.edu>
 
        * configure.in: Avoid 'test -a'.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index edfde91..d31cd63 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed Oct 10 17:34:15 2001  Joshua N Pritikin  <vishnu@pobox.com>
+
+       * configure.in: Un-conditionalize and require a 64-bit integer
+       type.
+
 2001-10-04  Raja R Harinath  <harinath@cs.umn.edu>
 
        * configure.in: Avoid 'test -a'.

diff --git a/configure.in b/configure.in
index e96c6a5..dc5d506 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -355,6 +355,15 @@ AC_CHECK_SIZEOF(void *)
 AC_CHECK_SIZEOF(long long)
 AC_CHECK_SIZEOF(__int64)
 
+if test x$ac_cv_sizeof_long == x8 -o x$ac_cv_sizeof_long_long == x8 ; then
+  :
+else
+  AC_MSG_ERROR([
+*** GLib requires a 64 bit type. You might want to consider
+*** using the GNU C compiler.
+])
+fi
+
 if test x$ac_cv_sizeof_long_long = x8; then
        # long long is a 64 bit integer.
        AC_MSG_CHECKING(for format to printf and scanf a gint64)
@@ -1658,6 +1667,10 @@ G_BEGIN_DECLS
 #define G_MAXLONG      $glib_Ml
 #define G_MAXULONG     $glib_Mul
 
+#define G_MININT64     ((gint64)  0x8000000000000000)
+#define G_MAXINT64     ((gint64)  0x7fffffffffffffff)
+#define G_MAXUINT64    ((guint64) 0xffffffffffffffff)
+
 _______EOF
 
 
@@ -1687,23 +1700,17 @@ typedef unsigned $gint32 guint32;
 _______EOF
        fi
 
-
-       if test -n "$gint64"; then
-           cat >>$outfile <<_______EOF
-#define G_HAVE_GINT64 1
+       cat >>$outfile <<_______EOF
+#define G_HAVE_GINT64 1          /* deprecated, always true */
 
 ${glib_extension}typedef signed $gint64 gint64;
 ${glib_extension}typedef unsigned $gint64 guint64;
 
 #define G_GINT64_CONSTANT(val) $gint64_constant
-_______EOF
-               if test -n "$gint64_format"; then
-         cat >>$outfile <<_______EOF
+
 #define G_GINT64_FORMAT $gint64_format
 #define G_GUINT64_FORMAT $guint64_format
 _______EOF
-               fi
-       fi
 
         cat >>$outfile <<_______EOF
 
@@ -1839,10 +1846,7 @@ union _GSystemThread
 _______EOF
 
        echo >>$outfile
-       g_bit_sizes="16 32"
-       if test -n "$gint64"; then
-         g_bit_sizes="$g_bit_sizes 64"
-       fi
+       g_bit_sizes="16 32 64"
        for bits in $g_bit_sizes; do
          cat >>$outfile <<_______EOF
 #define GINT${bits}_TO_${g_bs_native}(val)     ((gint${bits}) (val))