applied glib-tml-981120-0, change log appended below.

Tue Nov 24 18:57:59 PST 1998 Manish Singh <yosh@gimp.org>

        * applied glib-tml-981120-0, change log appended below.

        * glibconfig.h.win32: passthrough 64-bit constants unchanged, VC++
        infers them

Fri Nov 20 22:26:43 1998  Tor Lillqvist  <tml@iki.fi>

        * glib.h: Moved MSC pragmas from glib.h to glibconfig.h.win32.
        peer_offset field in WIN32 part of GIOChannel removed, need_wakeups
        added. Added "extern" to __declspec(dllimport).

        * gutils.c: Initialise need_wakeups.

        * glibconfig.h.win32: Pragmas moved here. Define G_GINT64_CONSTANT.

        * gmodule/gmodule.def: Added g_module_build_path.

        * gscanner.c: (g_scanner_cur_value) Move initailisation of v
        to before its use.

        * glib.def: Added g_(s)list_sort.

        * makefile.msc: A few more comments.

-Yosh

diff --git a/ChangeLog b/ChangeLog
index 30ad025..52f25c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+Tue Nov 24 18:57:59 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * applied glib-tml-981120-0, change log appended below.
+
+       * glibconfig.h.win32: passthrough 64-bit constants unchanged, VC++
+       infers them
+
+Fri Nov 20 22:26:43 1998  Tor Lillqvist  <tml@iki.fi>
+
+        * glib.h: Moved MSC pragmas from glib.h to glibconfig.h.win32.
+        peer_offset field in WIN32 part of GIOChannel removed, need_wakeups
+        added. Added "extern" to __declspec(dllimport).
+
+        * gutils.c: Initialise need_wakeups.
+
+        * glibconfig.h.win32: Pragmas moved here. Define G_GINT64_CONSTANT.
+
+        * gmodule/gmodule.def: Added g_module_build_path.
+
+        * gscanner.c: (g_scanner_cur_value) Move initailisation of v
+        to before its use.
+
+        * glib.def: Added g_(s)list_sort.
+
+        * makefile.msc: A few more comments.
+
 Tue Nov 24 14:05:47 EST 1998   Michael K. Johnson <johnsonm@redhat.com>
 
        * glib.h: added GFreeFunc and g_hash_table_set_key_freefunc()

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 30ad025..52f25c5 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,29 @@
+Tue Nov 24 18:57:59 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * applied glib-tml-981120-0, change log appended below.
+
+       * glibconfig.h.win32: passthrough 64-bit constants unchanged, VC++
+       infers them
+
+Fri Nov 20 22:26:43 1998  Tor Lillqvist  <tml@iki.fi>
+
+        * glib.h: Moved MSC pragmas from glib.h to glibconfig.h.win32.
+        peer_offset field in WIN32 part of GIOChannel removed, need_wakeups
+        added. Added "extern" to __declspec(dllimport).
+
+        * gutils.c: Initialise need_wakeups.
+
+        * glibconfig.h.win32: Pragmas moved here. Define G_GINT64_CONSTANT.
+
+        * gmodule/gmodule.def: Added g_module_build_path.
+
+        * gscanner.c: (g_scanner_cur_value) Move initailisation of v
+        to before its use.
+
+        * glib.def: Added g_(s)list_sort.
+
+        * makefile.msc: A few more comments.
+
 Tue Nov 24 14:05:47 EST 1998   Michael K. Johnson <johnsonm@redhat.com>
 
        * glib.h: added GFreeFunc and g_hash_table_set_key_freefunc()

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 30ad025..52f25c5 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,29 @@
+Tue Nov 24 18:57:59 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * applied glib-tml-981120-0, change log appended below.
+
+       * glibconfig.h.win32: passthrough 64-bit constants unchanged, VC++
+       infers them
+
+Fri Nov 20 22:26:43 1998  Tor Lillqvist  <tml@iki.fi>
+
+        * glib.h: Moved MSC pragmas from glib.h to glibconfig.h.win32.
+        peer_offset field in WIN32 part of GIOChannel removed, need_wakeups
+        added. Added "extern" to __declspec(dllimport).
+
+        * gutils.c: Initialise need_wakeups.
+
+        * glibconfig.h.win32: Pragmas moved here. Define G_GINT64_CONSTANT.
+
+        * gmodule/gmodule.def: Added g_module_build_path.
+
+        * gscanner.c: (g_scanner_cur_value) Move initailisation of v
+        to before its use.
+
+        * glib.def: Added g_(s)list_sort.
+
+        * makefile.msc: A few more comments.
+
 Tue Nov 24 14:05:47 EST 1998   Michael K. Johnson <johnsonm@redhat.com>
 
        * glib.h: added GFreeFunc and g_hash_table_set_key_freefunc()

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 30ad025..52f25c5 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,29 @@
+Tue Nov 24 18:57:59 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * applied glib-tml-981120-0, change log appended below.
+
+       * glibconfig.h.win32: passthrough 64-bit constants unchanged, VC++
+       infers them
+
+Fri Nov 20 22:26:43 1998  Tor Lillqvist  <tml@iki.fi>
+
+        * glib.h: Moved MSC pragmas from glib.h to glibconfig.h.win32.
+        peer_offset field in WIN32 part of GIOChannel removed, need_wakeups
+        added. Added "extern" to __declspec(dllimport).
+
+        * gutils.c: Initialise need_wakeups.
+
+        * glibconfig.h.win32: Pragmas moved here. Define G_GINT64_CONSTANT.
+
+        * gmodule/gmodule.def: Added g_module_build_path.
+
+        * gscanner.c: (g_scanner_cur_value) Move initailisation of v
+        to before its use.
+
+        * glib.def: Added g_(s)list_sort.
+
+        * makefile.msc: A few more comments.
+
 Tue Nov 24 14:05:47 EST 1998   Michael K. Johnson <johnsonm@redhat.com>
 
        * glib.h: added GFreeFunc and g_hash_table_set_key_freefunc()

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 30ad025..52f25c5 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,29 @@
+Tue Nov 24 18:57:59 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * applied glib-tml-981120-0, change log appended below.
+
+       * glibconfig.h.win32: passthrough 64-bit constants unchanged, VC++
+       infers them
+
+Fri Nov 20 22:26:43 1998  Tor Lillqvist  <tml@iki.fi>
+
+        * glib.h: Moved MSC pragmas from glib.h to glibconfig.h.win32.
+        peer_offset field in WIN32 part of GIOChannel removed, need_wakeups
+        added. Added "extern" to __declspec(dllimport).
+
+        * gutils.c: Initialise need_wakeups.
+
+        * glibconfig.h.win32: Pragmas moved here. Define G_GINT64_CONSTANT.
+
+        * gmodule/gmodule.def: Added g_module_build_path.
+
+        * gscanner.c: (g_scanner_cur_value) Move initailisation of v
+        to before its use.
+
+        * glib.def: Added g_(s)list_sort.
+
+        * makefile.msc: A few more comments.
+
 Tue Nov 24 14:05:47 EST 1998   Michael K. Johnson <johnsonm@redhat.com>
 
        * glib.h: added GFreeFunc and g_hash_table_set_key_freefunc()

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 30ad025..52f25c5 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,29 @@
+Tue Nov 24 18:57:59 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * applied glib-tml-981120-0, change log appended below.
+
+       * glibconfig.h.win32: passthrough 64-bit constants unchanged, VC++
+       infers them
+
+Fri Nov 20 22:26:43 1998  Tor Lillqvist  <tml@iki.fi>
+
+        * glib.h: Moved MSC pragmas from glib.h to glibconfig.h.win32.
+        peer_offset field in WIN32 part of GIOChannel removed, need_wakeups
+        added. Added "extern" to __declspec(dllimport).
+
+        * gutils.c: Initialise need_wakeups.
+
+        * glibconfig.h.win32: Pragmas moved here. Define G_GINT64_CONSTANT.
+
+        * gmodule/gmodule.def: Added g_module_build_path.
+
+        * gscanner.c: (g_scanner_cur_value) Move initailisation of v
+        to before its use.
+
+        * glib.def: Added g_(s)list_sort.
+
+        * makefile.msc: A few more comments.
+
 Tue Nov 24 14:05:47 EST 1998   Michael K. Johnson <johnsonm@redhat.com>
 
        * glib.h: added GFreeFunc and g_hash_table_set_key_freefunc()

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 30ad025..52f25c5 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,29 @@
+Tue Nov 24 18:57:59 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * applied glib-tml-981120-0, change log appended below.
+
+       * glibconfig.h.win32: passthrough 64-bit constants unchanged, VC++
+       infers them
+
+Fri Nov 20 22:26:43 1998  Tor Lillqvist  <tml@iki.fi>
+
+        * glib.h: Moved MSC pragmas from glib.h to glibconfig.h.win32.
+        peer_offset field in WIN32 part of GIOChannel removed, need_wakeups
+        added. Added "extern" to __declspec(dllimport).
+
+        * gutils.c: Initialise need_wakeups.
+
+        * glibconfig.h.win32: Pragmas moved here. Define G_GINT64_CONSTANT.
+
+        * gmodule/gmodule.def: Added g_module_build_path.
+
+        * gscanner.c: (g_scanner_cur_value) Move initailisation of v
+        to before its use.
+
+        * glib.def: Added g_(s)list_sort.
+
+        * makefile.msc: A few more comments.
+
 Tue Nov 24 14:05:47 EST 1998   Michael K. Johnson <johnsonm@redhat.com>
 
        * glib.h: added GFreeFunc and g_hash_table_set_key_freefunc()

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 30ad025..52f25c5 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,29 @@
+Tue Nov 24 18:57:59 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * applied glib-tml-981120-0, change log appended below.
+
+       * glibconfig.h.win32: passthrough 64-bit constants unchanged, VC++
+       infers them
+
+Fri Nov 20 22:26:43 1998  Tor Lillqvist  <tml@iki.fi>
+
+        * glib.h: Moved MSC pragmas from glib.h to glibconfig.h.win32.
+        peer_offset field in WIN32 part of GIOChannel removed, need_wakeups
+        added. Added "extern" to __declspec(dllimport).
+
+        * gutils.c: Initialise need_wakeups.
+
+        * glibconfig.h.win32: Pragmas moved here. Define G_GINT64_CONSTANT.
+
+        * gmodule/gmodule.def: Added g_module_build_path.
+
+        * gscanner.c: (g_scanner_cur_value) Move initailisation of v
+        to before its use.
+
+        * glib.def: Added g_(s)list_sort.
+
+        * makefile.msc: A few more comments.
+
 Tue Nov 24 14:05:47 EST 1998   Michael K. Johnson <johnsonm@redhat.com>
 
        * glib.h: added GFreeFunc and g_hash_table_set_key_freefunc()

diff --git a/glib.def b/glib.def
index e3cb814..4858d6c 100644 (file)
--- a/glib.def
+++ b/glib.def
@@ -116,6 +116,7 @@ EXPORTS
        g_list_remove_link
        g_list_reverse
        g_list_set_allocator
+       g_list_sort
        g_log
        g_log_default_handler
        g_log_remove_handler
@@ -241,6 +242,7 @@ EXPORTS
        g_slist_remove_link
        g_slist_reverse
        g_slist_set_allocator
+       g_slist_sort
        g_snprintf
        g_str_equal
        g_str_hash

diff --git a/glib.h b/glib.h
index 8ebb2af..a2f4327 100644 (file)
--- a/glib.h
+++ b/glib.h
@@ -89,33 +89,6 @@
 
 #endif /* !NATIVE_WIN32 */
 
-#ifdef _MSC_VER
-/* Make MSVC more pedantic, this is a recommended pragma list
- * from _Win32_Programming_ by Rector and Newcomer.
- */
-#pragma warning(error:4002)
-#pragma warning(error:4003)
-#pragma warning(1:4010)
-#pragma warning(error:4013)
-#pragma warning(1:4016)
-#pragma warning(error:4020)
-#pragma warning(error:4021)
-#pragma warning(error:4027)
-#pragma warning(error:4029)
-#pragma warning(error:4033)
-#pragma warning(error:4035)
-#pragma warning(error:4045)
-#pragma warning(error:4047)
-#pragma warning(error:4049)
-#pragma warning(error:4053)
-#pragma warning(error:4071)
-#pragma warning(disable:4101)
-#pragma warning(error:4150)
-
-#pragma warning(disable:4244)  /* No possible loss of data warnings, please */
-#endif /* _MSC_VER */
-
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -680,7 +653,7 @@ typedef gint32      GTime;
 #  ifdef GLIB_COMPILATION
 #    define GUTILS_C_VAR __declspec(dllexport)
 #  else /* !GLIB_COMPILATION */
-#    define GUTILS_C_VAR __declspec(dllimport)
+#    define GUTILS_C_VAR extern __declspec(dllimport)
 #  endif /* !GLIB_COMPILATION */
 #else /* !NATIVE_WIN32 */
 #  define GUTILS_C_VAR extern
@@ -2130,8 +2103,8 @@ struct _GIOChannel
                                 * be included in the message posted
                                 * so we keep in sync.
                                 */
-  guint peer_offset;           /* in input channels where the writer's
-                                * offset is, so we don't try to read too much
+  guint need_wakeups;          /* in output channels whether the reader
+                                * needs wakeups
                                 */
 #endif
 };

diff --git a/glib/glib.def b/glib/glib.def
index e3cb814..4858d6c 100644 (file)
--- a/glib/glib.def
+++ b/glib/glib.def
@@ -116,6 +116,7 @@ EXPORTS
        g_list_remove_link
        g_list_reverse
        g_list_set_allocator
+       g_list_sort
        g_log
        g_log_default_handler
        g_log_remove_handler
@@ -241,6 +242,7 @@ EXPORTS
        g_slist_remove_link
        g_slist_reverse
        g_slist_set_allocator
+       g_slist_sort
        g_snprintf
        g_str_equal
        g_str_hash

diff --git a/glib/glib.h b/glib/glib.h
index 8ebb2af..a2f4327 100644 (file)
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -89,33 +89,6 @@
 
 #endif /* !NATIVE_WIN32 */
 
-#ifdef _MSC_VER
-/* Make MSVC more pedantic, this is a recommended pragma list
- * from _Win32_Programming_ by Rector and Newcomer.
- */
-#pragma warning(error:4002)
-#pragma warning(error:4003)
-#pragma warning(1:4010)
-#pragma warning(error:4013)
-#pragma warning(1:4016)
-#pragma warning(error:4020)
-#pragma warning(error:4021)
-#pragma warning(error:4027)
-#pragma warning(error:4029)
-#pragma warning(error:4033)
-#pragma warning(error:4035)
-#pragma warning(error:4045)
-#pragma warning(error:4047)
-#pragma warning(error:4049)
-#pragma warning(error:4053)
-#pragma warning(error:4071)
-#pragma warning(disable:4101)
-#pragma warning(error:4150)
-
-#pragma warning(disable:4244)  /* No possible loss of data warnings, please */
-#endif /* _MSC_VER */
-
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -680,7 +653,7 @@ typedef gint32      GTime;
 #  ifdef GLIB_COMPILATION
 #    define GUTILS_C_VAR __declspec(dllexport)
 #  else /* !GLIB_COMPILATION */
-#    define GUTILS_C_VAR __declspec(dllimport)
+#    define GUTILS_C_VAR extern __declspec(dllimport)
 #  endif /* !GLIB_COMPILATION */
 #else /* !NATIVE_WIN32 */
 #  define GUTILS_C_VAR extern
@@ -2130,8 +2103,8 @@ struct _GIOChannel
                                 * be included in the message posted
                                 * so we keep in sync.
                                 */
-  guint peer_offset;           /* in input channels where the writer's
-                                * offset is, so we don't try to read too much
+  guint need_wakeups;          /* in output channels whether the reader
+                                * needs wakeups
                                 */
 #endif
 };

diff --git a/glib/gscanner.c b/glib/gscanner.c
index 04b3ae5..02985a7 100644 (file)
--- a/glib/gscanner.c
+++ b/glib/gscanner.c
@@ -620,12 +620,12 @@ g_scanner_cur_value (GScanner *scanner)
 {
   GTokenValue v;
   
+  v.v_int = 0;
+  
   g_return_val_if_fail (scanner != NULL, v);
 
   /* MSC isn't capable of handling return scanner->value; ? */
 
-  v.v_int = 0;
-  
   v = scanner->value;
 
   return v;

diff --git a/glib/gutils.c b/glib/gutils.c
index 92b0b19..bc4c452 100644 (file)
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -548,7 +548,7 @@ g_iochannel_new (gint fd)
   channel->peer = 0;
   channel->peer_fd = 0;
   channel->offset = 0;
-  channel->peer_offset = 0;
+  channel->need_wakeups = 0;
 #endif /* NATIVE_WIN32 */
 
   return channel;

diff --git a/glibconfig.h.win32 b/glibconfig.h.win32
index a4a57ad..9dde2c2 100644 (file)
--- a/glibconfig.h.win32
+++ b/glibconfig.h.win32
@@ -8,6 +8,32 @@
 extern "C" {
 #endif /* __cplusplus */
 
+#ifdef _MSC_VER
+/* Make MSVC more pedantic, this is a recommended pragma list
+ * from _Win32_Programming_ by Rector and Newcomer.
+ */
+#pragma warning(error:4002)
+#pragma warning(error:4003)
+#pragma warning(1:4010)
+#pragma warning(error:4013)
+#pragma warning(1:4016)
+#pragma warning(error:4020)
+#pragma warning(error:4021)
+#pragma warning(error:4027)
+#pragma warning(error:4029)
+#pragma warning(error:4033)
+#pragma warning(error:4035)
+#pragma warning(error:4045)
+#pragma warning(error:4047)
+#pragma warning(error:4049)
+#pragma warning(error:4053)
+#pragma warning(error:4071)
+#pragma warning(disable:4101)
+#pragma warning(error:4150)
+
+#pragma warning(disable:4244)  /* No possible loss of data warnings, please */
+#endif /* _MSC_VER */
+
 #include <limits.h>
 #include <float.h>
 
@@ -29,9 +55,12 @@ typedef unsigned short guint16;
 typedef signed int gint32;
 typedef unsigned int guint32;
 #define G_HAVE_GINT64 1
+
 typedef __int64 gint64;
 typedef unsigned __int64 guint64;
 
+#define G_GINT64_CONSTANT(val) (val)
+
 #define GPOINTER_TO_INT(p)     ((gint)(p))
 #define GPOINTER_TO_UINT(p)    ((guint)(p))
 

diff --git a/gmodule/gmodule.def b/gmodule/gmodule.def
index 966b868..5af8869 100644 (file)
--- a/gmodule/gmodule.def
+++ b/gmodule/gmodule.def
@@ -1,5 +1,6 @@
 EXPORTS
        g_log_domain_gmodule
+       g_module_build_path
        g_module_close
        g_module_error
        g_module_make_resident

diff --git a/gscanner.c b/gscanner.c
index 04b3ae5..02985a7 100644 (file)
--- a/gscanner.c
+++ b/gscanner.c
@@ -620,12 +620,12 @@ g_scanner_cur_value (GScanner *scanner)
 {
   GTokenValue v;
   
+  v.v_int = 0;
+  
   g_return_val_if_fail (scanner != NULL, v);
 
   /* MSC isn't capable of handling return scanner->value; ? */
 
-  v.v_int = 0;
-  
   v = scanner->value;
 
   return v;

diff --git a/gutils.c b/gutils.c
index 92b0b19..bc4c452 100644 (file)
--- a/gutils.c
+++ b/gutils.c
@@ -548,7 +548,7 @@ g_iochannel_new (gint fd)
   channel->peer = 0;
   channel->peer_fd = 0;
   channel->offset = 0;
-  channel->peer_offset = 0;
+  channel->need_wakeups = 0;
 #endif /* NATIVE_WIN32 */
 
   return channel;

diff --git a/makefile.msc b/makefile.msc
index 8d45a7a..6a7f9b6 100644 (file)
--- a/makefile.msc
+++ b/makefile.msc
@@ -1,9 +1,14 @@
 ## Makefile for building the GLib and gmodule dll with Microsoft C
 ## Use: nmake -f makefile.msc install
 
-# Change this to wherever you want to install the dlls
+# Change this to wherever you want to install the DLLs. This directory
+# should be in your PATH.
 BIN = C:\bin
 
+################################################################
+
+# Nothing much configurable below
+
 # cl -? described the options
 CC = cl -G5 -GF -Ox -W3 -D_DLL -nologo