Typo.

2001-10-23  Tor Lillqvist  <tml@iki.fi>

	* config.h.win32.in: Typo.

	* glibconfig.h.win32.in: Minor update to correspond to what
	configure now generates.

diff --git a/ChangeLog b/ChangeLog
index 41ca5fc8baa6fd6b2e567c2bd27fc986ed24b856..f32944d9273faa57a47ae53e559adad8ab7b95fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2001-10-23  Tor Lillqvist  <tml@iki.fi>
 
+       * config.h.win32.in: Typo.
+
+       * glibconfig.h.win32.in: Minor update to correspond to what
+       configure now generates.
+
        * glib/Makefile.am: (Win32): If we have built the MSVC import
        library, install it. Install the gcc import library. Also support
        uninstall.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 41ca5fc8baa6fd6b2e567c2bd27fc986ed24b856..f32944d9273faa57a47ae53e559adad8ab7b95fb 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,5 +1,10 @@
 2001-10-23  Tor Lillqvist  <tml@iki.fi>
 
+       * config.h.win32.in: Typo.
+
+       * glibconfig.h.win32.in: Minor update to correspond to what
+       configure now generates.
+
        * glib/Makefile.am: (Win32): If we have built the MSVC import
        library, install it. Install the gcc import library. Also support
        uninstall.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 41ca5fc8baa6fd6b2e567c2bd27fc986ed24b856..f32944d9273faa57a47ae53e559adad8ab7b95fb 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2001-10-23  Tor Lillqvist  <tml@iki.fi>
 
+       * config.h.win32.in: Typo.
+
+       * glibconfig.h.win32.in: Minor update to correspond to what
+       configure now generates.
+
        * glib/Makefile.am: (Win32): If we have built the MSVC import
        library, install it. Install the gcc import library. Also support
        uninstall.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 41ca5fc8baa6fd6b2e567c2bd27fc986ed24b856..f32944d9273faa57a47ae53e559adad8ab7b95fb 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,10 @@
 2001-10-23  Tor Lillqvist  <tml@iki.fi>
 
+       * config.h.win32.in: Typo.
+
+       * glibconfig.h.win32.in: Minor update to correspond to what
+       configure now generates.
+
        * glib/Makefile.am: (Win32): If we have built the MSVC import
        library, install it. Install the gcc import library. Also support
        uninstall.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 41ca5fc8baa6fd6b2e567c2bd27fc986ed24b856..f32944d9273faa57a47ae53e559adad8ab7b95fb 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,5 +1,10 @@
 2001-10-23  Tor Lillqvist  <tml@iki.fi>
 
+       * config.h.win32.in: Typo.
+
+       * glibconfig.h.win32.in: Minor update to correspond to what
+       configure now generates.
+
        * glib/Makefile.am: (Win32): If we have built the MSVC import
        library, install it. Install the gcc import library. Also support
        uninstall.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 41ca5fc8baa6fd6b2e567c2bd27fc986ed24b856..f32944d9273faa57a47ae53e559adad8ab7b95fb 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,10 @@
 2001-10-23  Tor Lillqvist  <tml@iki.fi>
 
+       * config.h.win32.in: Typo.
+
+       * glibconfig.h.win32.in: Minor update to correspond to what
+       configure now generates.
+
        * glib/Makefile.am: (Win32): If we have built the MSVC import
        library, install it. Install the gcc import library. Also support
        uninstall.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 41ca5fc8baa6fd6b2e567c2bd27fc986ed24b856..f32944d9273faa57a47ae53e559adad8ab7b95fb 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,10 @@
 2001-10-23  Tor Lillqvist  <tml@iki.fi>
 
+       * config.h.win32.in: Typo.
+
+       * glibconfig.h.win32.in: Minor update to correspond to what
+       configure now generates.
+
        * glib/Makefile.am: (Win32): If we have built the MSVC import
        library, install it. Install the gcc import library. Also support
        uninstall.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 41ca5fc8baa6fd6b2e567c2bd27fc986ed24b856..f32944d9273faa57a47ae53e559adad8ab7b95fb 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,10 @@
 2001-10-23  Tor Lillqvist  <tml@iki.fi>
 
+       * config.h.win32.in: Typo.
+
+       * glibconfig.h.win32.in: Minor update to correspond to what
+       configure now generates.
+
        * glib/Makefile.am: (Win32): If we have built the MSVC import
        library, install it. Install the gcc import library. Also support
        uninstall.

diff --git a/config.h.win32.in b/config.h.win32.in
index 0a0f2a20e2b001ecda00f02d5159b77a0fa188f0..1bc0c43034880aee13c5f509aa736093b1c2ec16 100644 (file)
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -1,4 +1,4 @@
-/* config.h.win32.in Merged from two version generated by configure.  */
+/* config.h.win32.in Merged from two versions generated by configure for gcc and MSVC.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
 /* GLIB - Library of useful routines for C programming
  * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald

diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in
index 099a1fe3270ed3bc64b0a14edd98f726dce132e5..c39dec7f07faff2300dd64733391c9e7293130c1 100644 (file)
--- a/glibconfig.h.win32.in
+++ b/glibconfig.h.win32.in
@@ -1,3 +1,4 @@
+/* glibconfig.h.win32.in Merged from two versions generated by configure for gcc and MSVC.  */
 /* glibconfig.h
  *
  * This is a generated file.  Please modify 'configure.in'
@@ -27,6 +28,10 @@ G_BEGIN_DECLS
 #define G_MAXLONG      LONG_MAX
 #define G_MAXULONG     ULONG_MAX
 
+#define G_MININT64     ((gint64)  0x8000000000000000)
+#define G_MAXINT64     ((gint64)  0x7fffffffffffffff)
+#define G_MAXUINT64    ((guint64) 0xffffffffffffffff)
+
 typedef signed char gint8;
 typedef unsigned char guint8;
 typedef signed short gint16;
@@ -37,7 +42,7 @@ typedef signed int gint32;
 typedef unsigned int guint32;
 #define G_GINT32_FORMAT "i"
 #define G_GUINT32_FORMAT "u"
-#define G_HAVE_GINT64 1
+#define G_HAVE_GINT64 1          /* deprecated, always true */
 
 #ifndef _MSC_VER
 G_GNUC_EXTENSION typedef signed long long gint64;