mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-08-20 23:58:54 +02:00
Update version numbers.
* 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.
This commit is contained in:
11
ChangeLog
11
ChangeLog
@@ -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>
|
Fri Mar 19 16:29:50 PST 1999 Manish Singh <yosh@gimp.org>
|
||||||
|
|
||||||
* acinclude.m4
|
* acinclude.m4
|
||||||
|
@@ -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>
|
Fri Mar 19 16:29:50 PST 1999 Manish Singh <yosh@gimp.org>
|
||||||
|
|
||||||
* acinclude.m4
|
* acinclude.m4
|
||||||
|
@@ -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>
|
Fri Mar 19 16:29:50 PST 1999 Manish Singh <yosh@gimp.org>
|
||||||
|
|
||||||
* acinclude.m4
|
* acinclude.m4
|
||||||
|
@@ -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>
|
Fri Mar 19 16:29:50 PST 1999 Manish Singh <yosh@gimp.org>
|
||||||
|
|
||||||
* acinclude.m4
|
* acinclude.m4
|
||||||
|
@@ -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>
|
Fri Mar 19 16:29:50 PST 1999 Manish Singh <yosh@gimp.org>
|
||||||
|
|
||||||
* acinclude.m4
|
* acinclude.m4
|
||||||
|
@@ -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>
|
Fri Mar 19 16:29:50 PST 1999 Manish Singh <yosh@gimp.org>
|
||||||
|
|
||||||
* acinclude.m4
|
* acinclude.m4
|
||||||
|
@@ -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>
|
Fri Mar 19 16:29:50 PST 1999 Manish Singh <yosh@gimp.org>
|
||||||
|
|
||||||
* acinclude.m4
|
* acinclude.m4
|
||||||
|
@@ -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>
|
Fri Mar 19 16:29:50 PST 1999 Manish Singh <yosh@gimp.org>
|
||||||
|
|
||||||
* acinclude.m4
|
* acinclude.m4
|
||||||
|
13
README.win32
13
README.win32
@@ -6,11 +6,12 @@ by the Microsoft runtime C library. Additionally the pthreads
|
|||||||
emulation library is used.
|
emulation library is used.
|
||||||
|
|
||||||
As for now, to build GLib on Win32, you need the Microsoft compiler
|
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
|
and tools. Both the compiler from MSVC 5.0 and from MSVC 6.0 have been
|
||||||
successfully.
|
used successfully.
|
||||||
|
|
||||||
Before building you must get the pthreads library for Windows from
|
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
|
pthreads library and include files in makefile.msc. Also edit the BIN
|
||||||
definition in makefile.msc.
|
definition in makefile.msc.
|
||||||
|
|
||||||
@@ -44,11 +45,11 @@ related to Win32:
|
|||||||
- _MSC_VER is defined when using the Microsoft compiler.
|
- _MSC_VER is defined when using the Microsoft compiler.
|
||||||
|
|
||||||
Currently the Win32 port uses the combination with all three of those
|
Currently the Win32 port uses the combination with all three of those
|
||||||
on, but eventually the cygwin compiler and tools will be supported
|
on, but eventually "gcc -mno-cygwin" will be supported also, and in
|
||||||
also, and in that case _MSC_VER wouldn't be defined.
|
that case _MSC_VER wouldn't be defined.
|
||||||
|
|
||||||
Some of the usage of these macros is probably a bit mixed up, and will
|
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.
|
have to be straightened out when actually trying other combinations.
|
||||||
|
|
||||||
The pthreads for Win32 package that the thread support uses isn't
|
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.
|
||||||
|
@@ -55,7 +55,7 @@
|
|||||||
#define G_HAVE___INLINE 1
|
#define G_HAVE___INLINE 1
|
||||||
|
|
||||||
#define GLIB_MAJOR_VERSION 1
|
#define GLIB_MAJOR_VERSION 1
|
||||||
#define GLIB_MINOR_VERSION 2
|
#define GLIB_MINOR_VERSION 3
|
||||||
#define GLIB_MICRO_VERSION 0
|
#define GLIB_MICRO_VERSION 0
|
||||||
#define GLIB_INTERFACE_AGE 0
|
#define GLIB_INTERFACE_AGE 0
|
||||||
#define GLIB_BINARY_AGE 0
|
#define GLIB_BINARY_AGE 0
|
||||||
|
@@ -77,7 +77,7 @@ typedef unsigned __int64 guint64;
|
|||||||
#define alloca _alloca
|
#define alloca _alloca
|
||||||
|
|
||||||
#define GLIB_MAJOR_VERSION 1
|
#define GLIB_MAJOR_VERSION 1
|
||||||
#define GLIB_MINOR_VERSION 2
|
#define GLIB_MINOR_VERSION 3
|
||||||
#define GLIB_MICRO_VERSION 0
|
#define GLIB_MICRO_VERSION 0
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
@@ -111,15 +111,15 @@ struct _GStaticMutex
|
|||||||
struct _GMutex *runtime_mutex;
|
struct _GMutex *runtime_mutex;
|
||||||
union {
|
union {
|
||||||
/* The size of the pad array should be sizeof (pthread_mutext_t) */
|
/* The size of the pad array should be sizeof (pthread_mutext_t) */
|
||||||
/* This value corresponds to the 1999-01-24 version of pthreads-win32 */
|
/* This value corresponds to the 1999-03-16 version of pthreads-win32 */
|
||||||
char pad[36];
|
char pad[4];
|
||||||
double dummy_double;
|
double dummy_double;
|
||||||
void *dummy_pointer;
|
void *dummy_pointer;
|
||||||
long dummy_long;
|
long dummy_long;
|
||||||
} aligned_pad_u;
|
} aligned_pad_u;
|
||||||
};
|
};
|
||||||
/* This should be NULL followed by the bytes in PTHREAD_MUTEX_INITIALIZER */
|
/* 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) \
|
#define g_static_mutex_get_mutex(mutex) \
|
||||||
(g_thread_use_default_impl ? ((GMutex*) &((mutex)->aligned_pad_u)) : \
|
(g_thread_use_default_impl ? ((GMutex*) &((mutex)->aligned_pad_u)) : \
|
||||||
g_static_mutex_get_mutex_impl (&((mutex)->runtime_mutex)))
|
g_static_mutex_get_mutex_impl (&((mutex)->runtime_mutex)))
|
||||||
|
@@ -21,7 +21,7 @@ CC = cl -G5 -GF -Ox -W3 -MD -nologo
|
|||||||
LDFLAGS = /link
|
LDFLAGS = /link
|
||||||
INSTALL = copy
|
INSTALL = copy
|
||||||
|
|
||||||
GLIB_VER = 1.2
|
GLIB_VER = 1.3
|
||||||
|
|
||||||
CFLAGS = -I. -DHAVE_CONFIG_H
|
CFLAGS = -I. -DHAVE_CONFIG_H
|
||||||
|
|
||||||
@@ -61,7 +61,9 @@ glib_OBJECTS = \
|
|||||||
gmutex.obj \
|
gmutex.obj \
|
||||||
gnode.obj \
|
gnode.obj \
|
||||||
gprimes.obj \
|
gprimes.obj \
|
||||||
|
gqueue.obj \
|
||||||
gslist.obj \
|
gslist.obj \
|
||||||
|
gstack.obj \
|
||||||
gtimer.obj \
|
gtimer.obj \
|
||||||
gtree.obj \
|
gtree.obj \
|
||||||
grel.obj \
|
grel.obj \
|
||||||
|
Reference in New Issue
Block a user