diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-2-12 | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 11 | ||||
| -rw-r--r-- | README.win32 | 13 | ||||
| -rw-r--r-- | config.h.win32 | 2 | ||||
| -rw-r--r-- | glibconfig.h.win32 | 8 | ||||
| -rw-r--r-- | makefile.msc | 4 |
12 files changed, 103 insertions, 12 deletions
@@ -1,3 +1,14 @@ +Thu Mar 25 22:45:47 1999 Tor Lillqvist <tml@iki.fi> + + * config.h.win32: Update version numbers. + + * glibconfig.h.win32: Update version numbers and pthreads-win32- + related magic values. + + * README.win32: Some improvements. + + * makefile.msc: Add gqueue and gstack. Correct version number. + Fri Mar 19 16:29:50 PST 1999 Manish Singh <yosh@gimp.org> * acinclude.m4 diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 0f59ee9ce..b3b586727 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,14 @@ +Thu Mar 25 22:45:47 1999 Tor Lillqvist <tml@iki.fi> + + * config.h.win32: Update version numbers. + + * glibconfig.h.win32: Update version numbers and pthreads-win32- + related magic values. + + * README.win32: Some improvements. + + * makefile.msc: Add gqueue and gstack. Correct version number. + Fri Mar 19 16:29:50 PST 1999 Manish Singh <yosh@gimp.org> * acinclude.m4 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0f59ee9ce..b3b586727 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,14 @@ +Thu Mar 25 22:45:47 1999 Tor Lillqvist <tml@iki.fi> + + * config.h.win32: Update version numbers. + + * glibconfig.h.win32: Update version numbers and pthreads-win32- + related magic values. + + * README.win32: Some improvements. + + * makefile.msc: Add gqueue and gstack. Correct version number. + Fri Mar 19 16:29:50 PST 1999 Manish Singh <yosh@gimp.org> * acinclude.m4 diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 0f59ee9ce..b3b586727 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,14 @@ +Thu Mar 25 22:45:47 1999 Tor Lillqvist <tml@iki.fi> + + * config.h.win32: Update version numbers. + + * glibconfig.h.win32: Update version numbers and pthreads-win32- + related magic values. + + * README.win32: Some improvements. + + * makefile.msc: Add gqueue and gstack. Correct version number. + Fri Mar 19 16:29:50 PST 1999 Manish Singh <yosh@gimp.org> * acinclude.m4 diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 0f59ee9ce..b3b586727 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,14 @@ +Thu Mar 25 22:45:47 1999 Tor Lillqvist <tml@iki.fi> + + * config.h.win32: Update version numbers. + + * glibconfig.h.win32: Update version numbers and pthreads-win32- + related magic values. + + * README.win32: Some improvements. + + * makefile.msc: Add gqueue and gstack. Correct version number. + Fri Mar 19 16:29:50 PST 1999 Manish Singh <yosh@gimp.org> * acinclude.m4 diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 0f59ee9ce..b3b586727 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,14 @@ +Thu Mar 25 22:45:47 1999 Tor Lillqvist <tml@iki.fi> + + * config.h.win32: Update version numbers. + + * glibconfig.h.win32: Update version numbers and pthreads-win32- + related magic values. + + * README.win32: Some improvements. + + * makefile.msc: Add gqueue and gstack. Correct version number. + Fri Mar 19 16:29:50 PST 1999 Manish Singh <yosh@gimp.org> * acinclude.m4 diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0f59ee9ce..b3b586727 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,14 @@ +Thu Mar 25 22:45:47 1999 Tor Lillqvist <tml@iki.fi> + + * config.h.win32: Update version numbers. + + * glibconfig.h.win32: Update version numbers and pthreads-win32- + related magic values. + + * README.win32: Some improvements. + + * makefile.msc: Add gqueue and gstack. Correct version number. + Fri Mar 19 16:29:50 PST 1999 Manish Singh <yosh@gimp.org> * acinclude.m4 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0f59ee9ce..b3b586727 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,14 @@ +Thu Mar 25 22:45:47 1999 Tor Lillqvist <tml@iki.fi> + + * config.h.win32: Update version numbers. + + * glibconfig.h.win32: Update version numbers and pthreads-win32- + related magic values. + + * README.win32: Some improvements. + + * makefile.msc: Add gqueue and gstack. Correct version number. + Fri Mar 19 16:29:50 PST 1999 Manish Singh <yosh@gimp.org> * acinclude.m4 diff --git a/README.win32 b/README.win32 index 27c4b7fe0..4d4e023fe 100644 --- a/README.win32 +++ b/README.win32 @@ -6,11 +6,12 @@ by the Microsoft runtime C library. Additionally the 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 MSVC 6.0 have been used -successfully. +and tools. Both the compiler from MSVC 5.0 and from MSVC 6.0 have been +used successfully. Before building you must get the pthreads library for Windows from -http://sourceware.cygnus.com/pthreads-win32/. Edit the location of the +http://sourceware.cygnus.com/pthreads-win32/. The pthreads-win32 +snapshot from 1999-03-16 is mostly OK. Edit the location of the pthreads library and include files in makefile.msc. Also edit the BIN definition in makefile.msc. @@ -44,11 +45,11 @@ related to Win32: - _MSC_VER is defined when using the Microsoft compiler. Currently the Win32 port uses the combination with all three of those -on, but eventually the cygwin compiler and tools will be supported -also, and in that case _MSC_VER wouldn't be defined. +on, but eventually "gcc -mno-cygwin" will be supported also, and in +that case _MSC_VER wouldn't be defined. Some of the usage of these macros is probably a bit mixed up, and will have to be straightened out when actually trying other combinations. The pthreads for Win32 package that the thread support uses isn't -released yet, and thus threads really should not be relied upon. +quite ready yet, and thus threads really should not be relied upon. diff --git a/config.h.win32 b/config.h.win32 index 2643bfa37..e27082f90 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -55,7 +55,7 @@ #define G_HAVE___INLINE 1 #define GLIB_MAJOR_VERSION 1 -#define GLIB_MINOR_VERSION 2 +#define GLIB_MINOR_VERSION 3 #define GLIB_MICRO_VERSION 0 #define GLIB_INTERFACE_AGE 0 #define GLIB_BINARY_AGE 0 diff --git a/glibconfig.h.win32 b/glibconfig.h.win32 index 663d28375..7b9480d97 100644 --- a/glibconfig.h.win32 +++ b/glibconfig.h.win32 @@ -77,7 +77,7 @@ typedef unsigned __int64 guint64; #define alloca _alloca #define GLIB_MAJOR_VERSION 1 -#define GLIB_MINOR_VERSION 2 +#define GLIB_MINOR_VERSION 3 #define GLIB_MICRO_VERSION 0 #ifdef __cplusplus @@ -111,15 +111,15 @@ struct _GStaticMutex struct _GMutex *runtime_mutex; union { /* The size of the pad array should be sizeof (pthread_mutext_t) */ - /* This value corresponds to the 1999-01-24 version of pthreads-win32 */ - char pad[36]; + /* This value corresponds to the 1999-03-16 version of pthreads-win32 */ + char pad[4]; double dummy_double; void *dummy_pointer; long dummy_long; } aligned_pad_u; }; /* This should be NULL followed by the bytes in PTHREAD_MUTEX_INITIALIZER */ -#define G_STATIC_MUTEX_INIT { NULL, { { 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } } } +#define G_STATIC_MUTEX_INIT { NULL, { { 1, 0, 0, 0 } } } #define g_static_mutex_get_mutex(mutex) \ (g_thread_use_default_impl ? ((GMutex*) &((mutex)->aligned_pad_u)) : \ g_static_mutex_get_mutex_impl (&((mutex)->runtime_mutex))) diff --git a/makefile.msc b/makefile.msc index 9b15dbaf5..6b6cf830a 100644 --- a/makefile.msc +++ b/makefile.msc @@ -21,7 +21,7 @@ CC = cl -G5 -GF -Ox -W3 -MD -nologo LDFLAGS = /link INSTALL = copy -GLIB_VER = 1.2 +GLIB_VER = 1.3 CFLAGS = -I. -DHAVE_CONFIG_H @@ -61,7 +61,9 @@ glib_OBJECTS = \ gmutex.obj \ gnode.obj \ gprimes.obj \ + gqueue.obj \ gslist.obj \ + gstack.obj \ gtimer.obj \ gtree.obj \ grel.obj \ |