Mention the tests directory.

	* README.win32: Mention the tests directory.

	* glib.def: Add the functions from grand.c.

	* glibconfig.h.win32: Add unsigned max values, and the format
 	strings.

	* makefile.msc: Add grand.

	* tests/{date-test,node-test}.c: Include <stdlib.h> for exit().

	* tests/makefile.msc: New file.

diff --git a/ChangeLog b/ChangeLog
index 0f46297..bd0c2ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Tue Apr 13 23:28:32 1999  Tor Lillqvist  <tml@iki.fi>
+
+       * README.win32: Mention the tests directory.
+
+       * glib.def: Add the functions from grand.c.
+
+       * glibconfig.h.win32: Add unsigned max values, and the format
+       strings.
+
+       * makefile.msc: Add grand.
+
+       * tests/{date-test,node-test}.c: Include <stdlib.h> for exit().
+
+       * tests/makefile.msc: New file.
+
 1999-04-12  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib.h: Moved struct declaration up. Style fixes.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0f46297..bd0c2ca 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,18 @@
+Tue Apr 13 23:28:32 1999  Tor Lillqvist  <tml@iki.fi>
+
+       * README.win32: Mention the tests directory.
+
+       * glib.def: Add the functions from grand.c.
+
+       * glibconfig.h.win32: Add unsigned max values, and the format
+       strings.
+
+       * makefile.msc: Add grand.
+
+       * tests/{date-test,node-test}.c: Include <stdlib.h> for exit().
+
+       * tests/makefile.msc: New file.
+
 1999-04-12  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib.h: Moved struct declaration up. Style fixes.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0f46297..bd0c2ca 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,18 @@
+Tue Apr 13 23:28:32 1999  Tor Lillqvist  <tml@iki.fi>
+
+       * README.win32: Mention the tests directory.
+
+       * glib.def: Add the functions from grand.c.
+
+       * glibconfig.h.win32: Add unsigned max values, and the format
+       strings.
+
+       * makefile.msc: Add grand.
+
+       * tests/{date-test,node-test}.c: Include <stdlib.h> for exit().
+
+       * tests/makefile.msc: New file.
+
 1999-04-12  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib.h: Moved struct declaration up. Style fixes.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 0f46297..bd0c2ca 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,18 @@
+Tue Apr 13 23:28:32 1999  Tor Lillqvist  <tml@iki.fi>
+
+       * README.win32: Mention the tests directory.
+
+       * glib.def: Add the functions from grand.c.
+
+       * glibconfig.h.win32: Add unsigned max values, and the format
+       strings.
+
+       * makefile.msc: Add grand.
+
+       * tests/{date-test,node-test}.c: Include <stdlib.h> for exit().
+
+       * tests/makefile.msc: New file.
+
 1999-04-12  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib.h: Moved struct declaration up. Style fixes.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0f46297..bd0c2ca 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,18 @@
+Tue Apr 13 23:28:32 1999  Tor Lillqvist  <tml@iki.fi>
+
+       * README.win32: Mention the tests directory.
+
+       * glib.def: Add the functions from grand.c.
+
+       * glibconfig.h.win32: Add unsigned max values, and the format
+       strings.
+
+       * makefile.msc: Add grand.
+
+       * tests/{date-test,node-test}.c: Include <stdlib.h> for exit().
+
+       * tests/makefile.msc: New file.
+
 1999-04-12  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib.h: Moved struct declaration up. Style fixes.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0f46297..bd0c2ca 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,18 @@
+Tue Apr 13 23:28:32 1999  Tor Lillqvist  <tml@iki.fi>
+
+       * README.win32: Mention the tests directory.
+
+       * glib.def: Add the functions from grand.c.
+
+       * glibconfig.h.win32: Add unsigned max values, and the format
+       strings.
+
+       * makefile.msc: Add grand.
+
+       * tests/{date-test,node-test}.c: Include <stdlib.h> for exit().
+
+       * tests/makefile.msc: New file.
+
 1999-04-12  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib.h: Moved struct declaration up. Style fixes.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0f46297..bd0c2ca 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,18 @@
+Tue Apr 13 23:28:32 1999  Tor Lillqvist  <tml@iki.fi>
+
+       * README.win32: Mention the tests directory.
+
+       * glib.def: Add the functions from grand.c.
+
+       * glibconfig.h.win32: Add unsigned max values, and the format
+       strings.
+
+       * makefile.msc: Add grand.
+
+       * tests/{date-test,node-test}.c: Include <stdlib.h> for exit().
+
+       * tests/makefile.msc: New file.
+
 1999-04-12  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib.h: Moved struct declaration up. Style fixes.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0f46297..bd0c2ca 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,18 @@
+Tue Apr 13 23:28:32 1999  Tor Lillqvist  <tml@iki.fi>
+
+       * README.win32: Mention the tests directory.
+
+       * glib.def: Add the functions from grand.c.
+
+       * glibconfig.h.win32: Add unsigned max values, and the format
+       strings.
+
+       * makefile.msc: Add grand.
+
+       * tests/{date-test,node-test}.c: Include <stdlib.h> for exit().
+
+       * tests/makefile.msc: New file.
+
 1999-04-12  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib.h: Moved struct declaration up. Style fixes.

diff --git a/README.win32 b/README.win32
index 4d4e023..212163c 100644 (file)
--- a/README.win32
+++ b/README.win32
@@ -2,8 +2,8 @@ For more information about the port or GLib, GTk+ and the GIMP to
 native Windows, and pre-built binary packages, see
 http://www.iki.fi/tml/gimp/win32/ . "Native" means that we use the
 Win32 API only, and not any POSIX emulation layer except that provided
-by the Microsoft runtime C library. Additionally the pthreads
-emulation library is used.
+by the Microsoft runtime C library. Additionally, a pthreads emulation
+library is used.
 
 As for now, to build GLib on Win32, you need the Microsoft compiler
 and tools. Both the compiler from MSVC 5.0 and from MSVC 6.0 have been
@@ -18,6 +18,9 @@ definition in makefile.msc.
 Build with `nmake -f makefile.msc`. Install with `nmake -f
 makefile.msc install`.
 
+To test the GLib functions, go to the tests subdirectory and enter
+`nmake -f makefile.msc check`.
+
 Support for building using the cygwin tools (without depending on the
 cygwin runtime, i.e. "mingw32"), and maybe LCC-Win32 might be added
 later. When using the cygwin tools *with* the cygwin runtime the

diff --git a/glib.def b/glib.def
index 7815cc2..833827b 100644 (file)
--- a/glib.def
+++ b/glib.def
@@ -264,6 +264,19 @@ EXPORTS
        g_queue_pop_front
        g_queue_push_back
        g_queue_push_front
+       g_rand_double
+       g_rand_double_range
+       g_rand_free
+       g_rand_int
+       g_rand_int_range
+       g_rand_new
+       g_rand_new_with_seed
+       g_rand_set_seed
+       g_random_double
+       g_random_double_range
+       g_random_int
+       g_random_int_range
+       g_random_set_seed
        g_realloc
        g_relation_count
        g_relation_delete

diff --git a/glib/glib.def b/glib/glib.def
index 7815cc2..833827b 100644 (file)
--- a/glib/glib.def
+++ b/glib/glib.def
@@ -264,6 +264,19 @@ EXPORTS
        g_queue_pop_front
        g_queue_push_back
        g_queue_push_front
+       g_rand_double
+       g_rand_double_range
+       g_rand_free
+       g_rand_int
+       g_rand_int_range
+       g_rand_new
+       g_rand_new_with_seed
+       g_rand_set_seed
+       g_random_double
+       g_random_double_range
+       g_random_int
+       g_random_int_range
+       g_random_set_seed
        g_realloc
        g_relation_count
        g_relation_delete

diff --git a/glibconfig.h.win32 b/glibconfig.h.win32
index 7b9480d..23334f0 100644 (file)
--- a/glibconfig.h.win32
+++ b/glibconfig.h.win32
@@ -44,23 +44,31 @@ extern "C" {
 #define G_MAXDOUBLE    DBL_MAX
 #define G_MINSHORT     SHRT_MIN
 #define G_MAXSHORT     SHRT_MAX
+#define G_MAXUSHORT    USHRT_MAX
 #define G_MININT       INT_MIN
 #define G_MAXINT       INT_MAX
+#define G_MAXUINT      UINT_MAX
 #define G_MINLONG      LONG_MIN
 #define G_MAXLONG      LONG_MAX
+#define G_MAXULONG     ULONG_MAX
 
 typedef signed char gint8;
 typedef unsigned char guint8;
 typedef signed short gint16;
 typedef unsigned short guint16;
+#define G_GINT16_FORMAT "hi"
+#define G_GUINT16_FORMAT "hu"
 typedef signed int gint32;
 typedef unsigned int guint32;
+#define G_GINT32_FORMAT "i"
+#define G_GUINT32_FORMAT "u"
 
 #define G_HAVE_GINT64 1
 
 typedef __int64 gint64;
 typedef unsigned __int64 guint64;
-
+#define G_GINT64_FORMAT "I64i"
+#define G_GUINT64_FORMAT "I64u"
 #define G_GINT64_CONSTANT(val) (val##i64)
 
 #define GPOINTER_TO_INT(p)     ((gint)(p))

diff --git a/makefile.msc b/makefile.msc
index 6b6cf83..4edac21 100644 (file)
--- a/makefile.msc
+++ b/makefile.msc
@@ -62,6 +62,7 @@ glib_OBJECTS = \
        gnode.obj       \
        gprimes.obj     \
        gqueue.obj      \
+       grand.obj       \
        gslist.obj      \
        gstack.obj      \
        gtimer.obj      \

diff --git a/tests/date-test.c b/tests/date-test.c
index 6dc0f57..e181edd 100644 (file)
--- a/tests/date-test.c
+++ b/tests/date-test.c
@@ -3,6 +3,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 #include <locale.h>
 #include <time.h>
 

diff --git a/tests/makefile.msc b/tests/makefile.msc
new file mode 100644 (file)
index 0000000..56a9210
--- /dev/null
+++ b/tests/makefile.msc
@@ -0,0 +1,54 @@
+## Makefile for building the GLib test programs with Microsoft C
+## Use: nmake -f makefile.msc all
+
+################################################################
+
+# Nothing much configurable below
+
+# cl -? described the options
+CC = cl -G5 -GF -Ox -W3 -MD -nologo
+
+# No general LDFLAGS needes
+LDFLAGS = /link
+INSTALL = copy
+
+GLIB_VER = 1.3
+
+CFLAGS = -I.. -DHAVE_CONFIG_H
+
+TESTS = \
+       array-test.exe  \
+       date-test.exe   \
+       dirname-test.exe\
+       hash-test.exe   \
+       list-test.exe   \
+       node-test.exe   \
+       queue-test.exe  \
+       rand-test.exe   \
+       relation-test.exe\
+       slist-test.exe  \
+       stack-test.exe  \
+       string-test.exe \
+       strfunc-test.exe\
+       tree-test.exe   \
+       type-test.exe
+
+all :  $(TESTS)
+
+.c.exe :
+       $(CC) $(CFLAGS) -c $<
+       $(CC) $(CFLAGS) -Fe$@ $< ..\glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
+
+check: all
+       for %p in ($(TESTS)) do %p
+
+clean:
+       del *.exe
+       del *.obj
+       del *.dll
+       del *.lib
+       del *.err
+       del *.map
+       del *.sym
+       del *.exp
+       del *.pdb

diff --git a/tests/node-test.c b/tests/node-test.c
index 0875687..3813666 100644 (file)
--- a/tests/node-test.c
+++ b/tests/node-test.c
@@ -32,6 +32,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>