Improve chance to generate unique names with less effort a bit.

2000-11-11  Tor Lillqvist  <tml@iki.fi>

	* gfileutils.c (g_mkstemp): Improve chance to generate unique
	names with less effort a bit.

	* gfileutils.h: Add g_file_open_tmp() declaration.

	* testglib.c: Include <io.h> on Win32.

	* makefile.mingw.in: Correct the way to invoke sub-makes.

2000-11-11  Tor Lillqvist  <tml@iki.fi>

	* gtypemodule.c: Include stdlib.h for exit().

	* makefile.{mingw,msc}.in (gobject_OBJECTS): Add gtypemodule.

	* gobject.def: Add new functions.

diff --git a/ChangeLog b/ChangeLog
index 9bbe5e261d1efcb0f94688d7b04958139649b88a..8b8d15390e56d575beafc717f25596a694a28c80 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2000-11-11  Tor Lillqvist  <tml@iki.fi>
+
+       * gfileutils.c (g_mkstemp): Improve chance to generate unique
+       names with less effort a bit.
+
+       * gfileutils.h: Add g_file_open_tmp() declaration.
+
+       * testglib.c: Include <io.h> on Win32.
+
+       * makefile.mingw.in: Correct the way to invoke sub-makes.
+
 Sun Nov  5 13:20:54 2000  Owen Taylor  <otaylor@redhat.com>
 
        * glib-object.h: Add gtypemodule.h

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9bbe5e261d1efcb0f94688d7b04958139649b88a..8b8d15390e56d575beafc717f25596a694a28c80 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,14 @@
+2000-11-11  Tor Lillqvist  <tml@iki.fi>
+
+       * gfileutils.c (g_mkstemp): Improve chance to generate unique
+       names with less effort a bit.
+
+       * gfileutils.h: Add g_file_open_tmp() declaration.
+
+       * testglib.c: Include <io.h> on Win32.
+
+       * makefile.mingw.in: Correct the way to invoke sub-makes.
+
 Sun Nov  5 13:20:54 2000  Owen Taylor  <otaylor@redhat.com>
 
        * glib-object.h: Add gtypemodule.h

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9bbe5e261d1efcb0f94688d7b04958139649b88a..8b8d15390e56d575beafc717f25596a694a28c80 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+2000-11-11  Tor Lillqvist  <tml@iki.fi>
+
+       * gfileutils.c (g_mkstemp): Improve chance to generate unique
+       names with less effort a bit.
+
+       * gfileutils.h: Add g_file_open_tmp() declaration.
+
+       * testglib.c: Include <io.h> on Win32.
+
+       * makefile.mingw.in: Correct the way to invoke sub-makes.
+
 Sun Nov  5 13:20:54 2000  Owen Taylor  <otaylor@redhat.com>
 
        * glib-object.h: Add gtypemodule.h

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 9bbe5e261d1efcb0f94688d7b04958139649b88a..8b8d15390e56d575beafc717f25596a694a28c80 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,14 @@
+2000-11-11  Tor Lillqvist  <tml@iki.fi>
+
+       * gfileutils.c (g_mkstemp): Improve chance to generate unique
+       names with less effort a bit.
+
+       * gfileutils.h: Add g_file_open_tmp() declaration.
+
+       * testglib.c: Include <io.h> on Win32.
+
+       * makefile.mingw.in: Correct the way to invoke sub-makes.
+
 Sun Nov  5 13:20:54 2000  Owen Taylor  <otaylor@redhat.com>
 
        * glib-object.h: Add gtypemodule.h

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9bbe5e261d1efcb0f94688d7b04958139649b88a..8b8d15390e56d575beafc717f25596a694a28c80 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+2000-11-11  Tor Lillqvist  <tml@iki.fi>
+
+       * gfileutils.c (g_mkstemp): Improve chance to generate unique
+       names with less effort a bit.
+
+       * gfileutils.h: Add g_file_open_tmp() declaration.
+
+       * testglib.c: Include <io.h> on Win32.
+
+       * makefile.mingw.in: Correct the way to invoke sub-makes.
+
 Sun Nov  5 13:20:54 2000  Owen Taylor  <otaylor@redhat.com>
 
        * glib-object.h: Add gtypemodule.h

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9bbe5e261d1efcb0f94688d7b04958139649b88a..8b8d15390e56d575beafc717f25596a694a28c80 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+2000-11-11  Tor Lillqvist  <tml@iki.fi>
+
+       * gfileutils.c (g_mkstemp): Improve chance to generate unique
+       names with less effort a bit.
+
+       * gfileutils.h: Add g_file_open_tmp() declaration.
+
+       * testglib.c: Include <io.h> on Win32.
+
+       * makefile.mingw.in: Correct the way to invoke sub-makes.
+
 Sun Nov  5 13:20:54 2000  Owen Taylor  <otaylor@redhat.com>
 
        * glib-object.h: Add gtypemodule.h

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9bbe5e261d1efcb0f94688d7b04958139649b88a..8b8d15390e56d575beafc717f25596a694a28c80 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+2000-11-11  Tor Lillqvist  <tml@iki.fi>
+
+       * gfileutils.c (g_mkstemp): Improve chance to generate unique
+       names with less effort a bit.
+
+       * gfileutils.h: Add g_file_open_tmp() declaration.
+
+       * testglib.c: Include <io.h> on Win32.
+
+       * makefile.mingw.in: Correct the way to invoke sub-makes.
+
 Sun Nov  5 13:20:54 2000  Owen Taylor  <otaylor@redhat.com>
 
        * glib-object.h: Add gtypemodule.h

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9bbe5e261d1efcb0f94688d7b04958139649b88a..8b8d15390e56d575beafc717f25596a694a28c80 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+2000-11-11  Tor Lillqvist  <tml@iki.fi>
+
+       * gfileutils.c (g_mkstemp): Improve chance to generate unique
+       names with less effort a bit.
+
+       * gfileutils.h: Add g_file_open_tmp() declaration.
+
+       * testglib.c: Include <io.h> on Win32.
+
+       * makefile.mingw.in: Correct the way to invoke sub-makes.
+
 Sun Nov  5 13:20:54 2000  Owen Taylor  <otaylor@redhat.com>
 
        * glib-object.h: Add gtypemodule.h

diff --git a/gfileutils.c b/gfileutils.c
index c8bb0a7ccf341904e72aedb39b852b4d2ef4515a..b897e1b0a950ca1c76abdb92e7b800f8c34b6f71 100644 (file)
--- a/gfileutils.c
+++ b/gfileutils.c
@@ -538,6 +538,7 @@ g_mkstemp (char *tmpl)
   static const int NLETTERS = sizeof (letters) - 1;
   glong value;
   GTimeVal tv;
+  static int counter = 0;
 
   len = strlen (tmpl);
   if (len < 6 || strcmp (&tmpl[len - 6], "XXXXXX"))
@@ -548,7 +549,7 @@ g_mkstemp (char *tmpl)
 
   /* Get some more or less random data.  */
   g_get_current_time (&tv);
-  value = tv.tv_usec ^ tv.tv_sec;
+  value = (tv.tv_usec ^ tv.tv_sec) + counter++;
 
   for (count = 0; count < 100; value += 7777, ++count)
     {

diff --git a/gfileutils.h b/gfileutils.h
index dba134e84d0ccc38f046f9cbbb4d88bdc3c7955a..0e80543c65cf6850bdcf21dd28a9c1ab8cd394fa 100644 (file)
--- a/gfileutils.h
+++ b/gfileutils.h
@@ -81,7 +81,12 @@ gboolean g_file_get_contents (const gchar  *filename,
 
 
 /* Wrapper / workalike for mkstemp() */
-int     g_mkstemp (char *tmpl);
+int     g_mkstemp            (char         *tmpl);
+
+/* Wrapper for g_mkstemp */
+int     g_file_open_tmp      (const char   *template,
+                             char        **name_used,
+                             GError      **error);
 
 G_END_DECLS
 

diff --git a/glib/gfileutils.c b/glib/gfileutils.c
index c8bb0a7ccf341904e72aedb39b852b4d2ef4515a..b897e1b0a950ca1c76abdb92e7b800f8c34b6f71 100644 (file)
--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -538,6 +538,7 @@ g_mkstemp (char *tmpl)
   static const int NLETTERS = sizeof (letters) - 1;
   glong value;
   GTimeVal tv;
+  static int counter = 0;
 
   len = strlen (tmpl);
   if (len < 6 || strcmp (&tmpl[len - 6], "XXXXXX"))
@@ -548,7 +549,7 @@ g_mkstemp (char *tmpl)
 
   /* Get some more or less random data.  */
   g_get_current_time (&tv);
-  value = tv.tv_usec ^ tv.tv_sec;
+  value = (tv.tv_usec ^ tv.tv_sec) + counter++;
 
   for (count = 0; count < 100; value += 7777, ++count)
     {

diff --git a/glib/gfileutils.h b/glib/gfileutils.h
index dba134e84d0ccc38f046f9cbbb4d88bdc3c7955a..0e80543c65cf6850bdcf21dd28a9c1ab8cd394fa 100644 (file)
--- a/glib/gfileutils.h
+++ b/glib/gfileutils.h
@@ -81,7 +81,12 @@ gboolean g_file_get_contents (const gchar  *filename,
 
 
 /* Wrapper / workalike for mkstemp() */
-int     g_mkstemp (char *tmpl);
+int     g_mkstemp            (char         *tmpl);
+
+/* Wrapper for g_mkstemp */
+int     g_file_open_tmp      (const char   *template,
+                             char        **name_used,
+                             GError      **error);
 
 G_END_DECLS
 

diff --git a/glib/makefile.mingw.in b/glib/makefile.mingw.in
index 5e7c948532e5385fda4b1ef12cef14299c9a0033..2ae090ae490909f18db39f6d35ed8cd41c4d1c4e 100644 (file)
--- a/glib/makefile.mingw.in
+++ b/glib/makefile.mingw.in
@@ -24,10 +24,9 @@ DEPCFLAGS = $(LIBICONV_CFLAGS)
 
 DLLS_TO_BUILD =                                \
        glib-$(GLIB_VER).dll            \
-       gmodule/gmodule-$(GLIB_VER).dll \
-       gthread/gthread-$(GLIB_VER).dll \
-       gobject/gobject-$(GLIB_VER).dll
-
+       sub-gmodule                     \
+       sub-gthread                     \
+       sub-gobject
 
 all :                          \
        config.h                \
@@ -102,13 +101,13 @@ gspawn-win32-helper.exe : gspawn-win32.c
 
 ################ subdirectories
 
-gmodule/gmodule-$(GLIB_VER).dll : glib-$(GLIB_VER).dll
+sub-gmodule :
        cd gmodule && $(MAKE) -f makefile.mingw all
 
-gthread/gthread-$(GLIB_VER).dll : glib-$(GLIB_VER).dll
+sub-gthread :
        cd gthread && $(MAKE) -f makefile.mingw all
 
-gobject/gobject-$(GLIB_VER).dll : glib-$(GLIB_VER).dll
+sub-gobject :
        cd gobject && $(MAKE) -f makefile.mingw all
 
 ################ test progs

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index f8a0f7996a6ff809fab935272f3f3926d64eac2d..6443eb937f8ed8ae13d381c620f89654ab604899 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,11 @@
+2000-11-11  Tor Lillqvist  <tml@iki.fi>
+
+       * gtypemodule.c: Include stdlib.h for exit().
+
+       * makefile.{mingw,msc}.in (gobject_OBJECTS): Add gtypemodule.
+
+       * gobject.def: Add new functions.
+
 Sun Nov  5 13:21:28 2000  Owen Taylor  <otaylor@redhat.com>
 
        * Makefile.am gtypemodule.[ch]: New basic implementation of

diff --git a/gobject/gobject.def b/gobject/gobject.def
index c0bb1f3cc07dc58cf0dbb6f0eefb02028370e3de..ca84959cbe15b0d401a01ce467665cf6d910241e 100644 (file)
--- a/gobject/gobject.def
+++ b/gobject/gobject.def
@@ -110,9 +110,20 @@ EXPORTS
        g_type_interface_peek
        g_type_interfaces
        g_type_is_a
+       g_type_module_add_interface
+       g_type_module_get_type
+       g_type_module_register_type
+       g_type_module_set_name
+       g_type_module_unuse
+       g_type_module_use
        g_type_name
        g_type_next_base
        g_type_parent
+       g_type_plugin_complete_interface_info
+       g_type_plugin_complete_type_info
+       g_type_plugin_get_type
+       g_type_plugin_unuse
+       g_type_plugin_use
        g_type_qname
        g_type_register_dynamic
        g_type_register_fundamental

diff --git a/gobject/gtypemodule.c b/gobject/gtypemodule.c
index 32f07f71984e4d33746693831fc3a74a4a21203e..4e5848e9045df0ddf9db745765971e6c7a89f428 100644 (file)
--- a/gobject/gtypemodule.c
+++ b/gobject/gtypemodule.c
@@ -17,6 +17,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <stdlib.h>
+
 #include "gtypeplugin.h"
 #include "gtypemodule.h"
 

diff --git a/gobject/makefile.mingw.in b/gobject/makefile.mingw.in
index eccd5b6618fb03428aa783be05179194afc12b9d..a0f0669e63f5416ac62e5b18a3c3eec94ea9adc5 100644 (file)
--- a/gobject/makefile.mingw.in
+++ b/gobject/makefile.mingw.in
@@ -38,6 +38,7 @@ gobject_OBJECTS =             \
        gparamspecs.o           \
        gsignal.o               \
        gtype.o                 \
+       gtypemodule.o           \
        gtypeplugin.o           \
        gvalue.o                \
        gvaluetypes.o

diff --git a/gobject/makefile.msc.in b/gobject/makefile.msc.in
index eb69589e0aa2366130226f94b82ffedec06c46a9..db24b23dc94aff038c083289fef0175d2016d052 100644 (file)
--- a/gobject/makefile.msc.in
+++ b/gobject/makefile.msc.in
@@ -29,6 +29,7 @@ gobject_OBJECTS =             \
        gparamspecs.obj         \
        gsignal.obj             \
        gtype.obj               \
+       gtypemodule.obj         \
        gtypeplugin.obj         \
        gvalue.obj              \
        gvaluetypes.obj

diff --git a/makefile.mingw.in b/makefile.mingw.in
index 5e7c948532e5385fda4b1ef12cef14299c9a0033..2ae090ae490909f18db39f6d35ed8cd41c4d1c4e 100644 (file)
--- a/makefile.mingw.in
+++ b/makefile.mingw.in
@@ -24,10 +24,9 @@ DEPCFLAGS = $(LIBICONV_CFLAGS)
 
 DLLS_TO_BUILD =                                \
        glib-$(GLIB_VER).dll            \
-       gmodule/gmodule-$(GLIB_VER).dll \
-       gthread/gthread-$(GLIB_VER).dll \
-       gobject/gobject-$(GLIB_VER).dll
-
+       sub-gmodule                     \
+       sub-gthread                     \
+       sub-gobject
 
 all :                          \
        config.h                \
@@ -102,13 +101,13 @@ gspawn-win32-helper.exe : gspawn-win32.c
 
 ################ subdirectories
 
-gmodule/gmodule-$(GLIB_VER).dll : glib-$(GLIB_VER).dll
+sub-gmodule :
        cd gmodule && $(MAKE) -f makefile.mingw all
 
-gthread/gthread-$(GLIB_VER).dll : glib-$(GLIB_VER).dll
+sub-gthread :
        cd gthread && $(MAKE) -f makefile.mingw all
 
-gobject/gobject-$(GLIB_VER).dll : glib-$(GLIB_VER).dll
+sub-gobject :
        cd gobject && $(MAKE) -f makefile.mingw all
 
 ################ test progs

diff --git a/testglib.c b/testglib.c
index 3eedc81dd5b298fa0ac4570a956d703b4a80e651..2f7b61524eb51face75d987d2436257330591365 100644 (file)
--- a/testglib.c
+++ b/testglib.c
@@ -24,13 +24,24 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include "config.h"
+
 #undef G_LOG_DOMAIN
 
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+
 #include "glib.h"
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef G_OS_WIN32
+#include <io.h>                        /* For read(), write() etc */
+#endif
+
 int array[10000];
 gboolean failed = FALSE;
 

diff --git a/tests/testglib.c b/tests/testglib.c
index 3eedc81dd5b298fa0ac4570a956d703b4a80e651..2f7b61524eb51face75d987d2436257330591365 100644 (file)
--- a/tests/testglib.c
+++ b/tests/testglib.c
@@ -24,13 +24,24 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include "config.h"
+
 #undef G_LOG_DOMAIN
 
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+
 #include "glib.h"
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef G_OS_WIN32
+#include <io.h>                        /* For read(), write() etc */
+#endif
+
 int array[10000];
 gboolean failed = FALSE;