mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-08-07 17:54:05 +02:00
Retract my change earlier today. Don't preset autoconf variables in a try
2001-09-26 Tor Lillqvist <tml@iki.fi> * configure.in: Retract my change earlier today. Don't preset autoconf variables in a try to match both mingw and MSVC. Instead, he who packages a prebuilt GLib developer distribution for Win32 runs configure twice: once for mingw, once for MSVC, and then uses diff -D on the glibconfig.h files to generate a suitably ifdeffed glibconfig.h for distribution that suits both compilers. (Ditto for config.h, although that file wouldn't be distributed in a developer package, but in a source package for Win32 users who want to build GLib but can't use configure.) * glibconfig.h.win32.in * config.h.win32.in: Generated by using diff -D as described above. * tests/makefile.mingw.in (.c.exe): Correct name of gthread (import) library. gthread: 2001-09-26 Tor Lillqvist <tml@iki.fi> * makefile.mingw.in: Fix couple of typos. * gthread.def: Add g_thread_init_with_errorcheck_mutexes.
This commit is contained in:
Tor Lillqvist
committed by
Tor Lillqvist
Tor Lillqvist
parent
861fb083f2
commit
18190575f8
18
ChangeLog
18
ChangeLog
@@ -1,3 +1,21 @@
|
||||
2001-09-26 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* configure.in: Retract my change earlier today. Don't preset
|
||||
autoconf variables in a try to match both mingw and MSVC. Instead,
|
||||
he who packages a prebuilt GLib developer distribution for Win32
|
||||
runs configure twice: once for mingw, once for MSVC, and then uses
|
||||
diff -D on the glibconfig.h files to generate a suitably ifdeffed
|
||||
glibconfig.h for distribution that suits both compilers. (Ditto
|
||||
for config.h, although that file wouldn't be distributed in a
|
||||
developer package, but in a source package for Win32 users who
|
||||
want to build GLib but can't use configure.)
|
||||
|
||||
* glibconfig.h.win32.in
|
||||
* config.h.win32.in: Generated by using diff -D as described above.
|
||||
|
||||
* tests/makefile.mingw.in (.c.exe): Correct name of gthread (import)
|
||||
library.
|
||||
|
||||
Wed Sep 26 15:33:37 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* Makefile.am po/Makefile.in.in: Fix distclean to
|
||||
|
||||
@@ -1,3 +1,21 @@
|
||||
2001-09-26 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* configure.in: Retract my change earlier today. Don't preset
|
||||
autoconf variables in a try to match both mingw and MSVC. Instead,
|
||||
he who packages a prebuilt GLib developer distribution for Win32
|
||||
runs configure twice: once for mingw, once for MSVC, and then uses
|
||||
diff -D on the glibconfig.h files to generate a suitably ifdeffed
|
||||
glibconfig.h for distribution that suits both compilers. (Ditto
|
||||
for config.h, although that file wouldn't be distributed in a
|
||||
developer package, but in a source package for Win32 users who
|
||||
want to build GLib but can't use configure.)
|
||||
|
||||
* glibconfig.h.win32.in
|
||||
* config.h.win32.in: Generated by using diff -D as described above.
|
||||
|
||||
* tests/makefile.mingw.in (.c.exe): Correct name of gthread (import)
|
||||
library.
|
||||
|
||||
Wed Sep 26 15:33:37 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* Makefile.am po/Makefile.in.in: Fix distclean to
|
||||
|
||||
@@ -1,3 +1,21 @@
|
||||
2001-09-26 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* configure.in: Retract my change earlier today. Don't preset
|
||||
autoconf variables in a try to match both mingw and MSVC. Instead,
|
||||
he who packages a prebuilt GLib developer distribution for Win32
|
||||
runs configure twice: once for mingw, once for MSVC, and then uses
|
||||
diff -D on the glibconfig.h files to generate a suitably ifdeffed
|
||||
glibconfig.h for distribution that suits both compilers. (Ditto
|
||||
for config.h, although that file wouldn't be distributed in a
|
||||
developer package, but in a source package for Win32 users who
|
||||
want to build GLib but can't use configure.)
|
||||
|
||||
* glibconfig.h.win32.in
|
||||
* config.h.win32.in: Generated by using diff -D as described above.
|
||||
|
||||
* tests/makefile.mingw.in (.c.exe): Correct name of gthread (import)
|
||||
library.
|
||||
|
||||
Wed Sep 26 15:33:37 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* Makefile.am po/Makefile.in.in: Fix distclean to
|
||||
|
||||
@@ -1,3 +1,21 @@
|
||||
2001-09-26 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* configure.in: Retract my change earlier today. Don't preset
|
||||
autoconf variables in a try to match both mingw and MSVC. Instead,
|
||||
he who packages a prebuilt GLib developer distribution for Win32
|
||||
runs configure twice: once for mingw, once for MSVC, and then uses
|
||||
diff -D on the glibconfig.h files to generate a suitably ifdeffed
|
||||
glibconfig.h for distribution that suits both compilers. (Ditto
|
||||
for config.h, although that file wouldn't be distributed in a
|
||||
developer package, but in a source package for Win32 users who
|
||||
want to build GLib but can't use configure.)
|
||||
|
||||
* glibconfig.h.win32.in
|
||||
* config.h.win32.in: Generated by using diff -D as described above.
|
||||
|
||||
* tests/makefile.mingw.in (.c.exe): Correct name of gthread (import)
|
||||
library.
|
||||
|
||||
Wed Sep 26 15:33:37 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* Makefile.am po/Makefile.in.in: Fix distclean to
|
||||
|
||||
@@ -1,3 +1,21 @@
|
||||
2001-09-26 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* configure.in: Retract my change earlier today. Don't preset
|
||||
autoconf variables in a try to match both mingw and MSVC. Instead,
|
||||
he who packages a prebuilt GLib developer distribution for Win32
|
||||
runs configure twice: once for mingw, once for MSVC, and then uses
|
||||
diff -D on the glibconfig.h files to generate a suitably ifdeffed
|
||||
glibconfig.h for distribution that suits both compilers. (Ditto
|
||||
for config.h, although that file wouldn't be distributed in a
|
||||
developer package, but in a source package for Win32 users who
|
||||
want to build GLib but can't use configure.)
|
||||
|
||||
* glibconfig.h.win32.in
|
||||
* config.h.win32.in: Generated by using diff -D as described above.
|
||||
|
||||
* tests/makefile.mingw.in (.c.exe): Correct name of gthread (import)
|
||||
library.
|
||||
|
||||
Wed Sep 26 15:33:37 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* Makefile.am po/Makefile.in.in: Fix distclean to
|
||||
|
||||
@@ -1,3 +1,21 @@
|
||||
2001-09-26 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* configure.in: Retract my change earlier today. Don't preset
|
||||
autoconf variables in a try to match both mingw and MSVC. Instead,
|
||||
he who packages a prebuilt GLib developer distribution for Win32
|
||||
runs configure twice: once for mingw, once for MSVC, and then uses
|
||||
diff -D on the glibconfig.h files to generate a suitably ifdeffed
|
||||
glibconfig.h for distribution that suits both compilers. (Ditto
|
||||
for config.h, although that file wouldn't be distributed in a
|
||||
developer package, but in a source package for Win32 users who
|
||||
want to build GLib but can't use configure.)
|
||||
|
||||
* glibconfig.h.win32.in
|
||||
* config.h.win32.in: Generated by using diff -D as described above.
|
||||
|
||||
* tests/makefile.mingw.in (.c.exe): Correct name of gthread (import)
|
||||
library.
|
||||
|
||||
Wed Sep 26 15:33:37 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* Makefile.am po/Makefile.in.in: Fix distclean to
|
||||
|
||||
@@ -1,3 +1,21 @@
|
||||
2001-09-26 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* configure.in: Retract my change earlier today. Don't preset
|
||||
autoconf variables in a try to match both mingw and MSVC. Instead,
|
||||
he who packages a prebuilt GLib developer distribution for Win32
|
||||
runs configure twice: once for mingw, once for MSVC, and then uses
|
||||
diff -D on the glibconfig.h files to generate a suitably ifdeffed
|
||||
glibconfig.h for distribution that suits both compilers. (Ditto
|
||||
for config.h, although that file wouldn't be distributed in a
|
||||
developer package, but in a source package for Win32 users who
|
||||
want to build GLib but can't use configure.)
|
||||
|
||||
* glibconfig.h.win32.in
|
||||
* config.h.win32.in: Generated by using diff -D as described above.
|
||||
|
||||
* tests/makefile.mingw.in (.c.exe): Correct name of gthread (import)
|
||||
library.
|
||||
|
||||
Wed Sep 26 15:33:37 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* Makefile.am po/Makefile.in.in: Fix distclean to
|
||||
|
||||
@@ -1,3 +1,21 @@
|
||||
2001-09-26 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* configure.in: Retract my change earlier today. Don't preset
|
||||
autoconf variables in a try to match both mingw and MSVC. Instead,
|
||||
he who packages a prebuilt GLib developer distribution for Win32
|
||||
runs configure twice: once for mingw, once for MSVC, and then uses
|
||||
diff -D on the glibconfig.h files to generate a suitably ifdeffed
|
||||
glibconfig.h for distribution that suits both compilers. (Ditto
|
||||
for config.h, although that file wouldn't be distributed in a
|
||||
developer package, but in a source package for Win32 users who
|
||||
want to build GLib but can't use configure.)
|
||||
|
||||
* glibconfig.h.win32.in
|
||||
* config.h.win32.in: Generated by using diff -D as described above.
|
||||
|
||||
* tests/makefile.mingw.in (.c.exe): Correct name of gthread (import)
|
||||
library.
|
||||
|
||||
Wed Sep 26 15:33:37 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* Makefile.am po/Makefile.in.in: Fix distclean to
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* config.h.win32. Pregenerated . */
|
||||
/* config.h.win32.in Merged from two version generated by configure. */
|
||||
/* config.h.in. Generated from configure.in by autoheader. */
|
||||
/* GLIB - Library of useful routines for C programming
|
||||
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
||||
@@ -50,7 +50,11 @@
|
||||
#define GLIB_LOCALE_DIR "NONE/lib/locale"
|
||||
#define HAVE_GETTEXT 1
|
||||
/* #undef HAVE_LC_MESSAGES */
|
||||
#ifndef _MSC_VER
|
||||
#define SANE_MALLOC_PROTOS 1
|
||||
#else /* _MSC_VER */
|
||||
/* #undef SANE_MALLOC_PROTOS */
|
||||
#endif /* _MSC_VER */
|
||||
#define USE_LIBICONV 1
|
||||
|
||||
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
|
||||
@@ -89,7 +93,11 @@
|
||||
/* #undef GLIB_SIZEOF_GMUTEX */
|
||||
|
||||
/* Size of intmax_t */
|
||||
#ifndef _MSC_VER
|
||||
#define GLIB_SIZEOF_INTMAX_T 8
|
||||
#else /* _MSC_VER */
|
||||
#define GLIB_SIZEOF_INTMAX_T 0
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
/* Size of ptrdiff_t */
|
||||
#define GLIB_SIZEOF_PTRDIFF_T 4
|
||||
@@ -104,13 +112,21 @@
|
||||
#define G_COMPILED_WITH_DEBUGGING "yes"
|
||||
|
||||
/* Have inline keyword */
|
||||
#ifndef _MSC_VER
|
||||
#define G_HAVE_INLINE 1
|
||||
#else /* _MSC_VER */
|
||||
/* #undef G_HAVE_INLINE */
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
/* Have __inline keyword */
|
||||
#define G_HAVE___INLINE 1
|
||||
|
||||
/* Have __inline__ keyword */
|
||||
#ifndef _MSC_VER
|
||||
#define G_HAVE___INLINE__ 1
|
||||
#else /* _MSC_VER */
|
||||
/* #undef G_HAVE___INLINE__ */
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
/* Source file containing theread implementation */
|
||||
#define G_THREAD_SOURCE "gthread-win32.c"
|
||||
@@ -155,7 +171,11 @@
|
||||
#define HAVE_GETCWD 1
|
||||
|
||||
/* Define if you have the `getpagesize' function. */
|
||||
#ifndef _MSC_VER
|
||||
#define HAVE_GETPAGESIZE 1
|
||||
#else /* _MSC_VER */
|
||||
/* #undef HAVE_GETPAGESIZE */
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
/* Define if you have the <inttypes.h> header file. */
|
||||
/* #undef HAVE_INTTYPES_H */
|
||||
@@ -227,7 +247,11 @@
|
||||
#define HAVE_SETLOCALE 1
|
||||
|
||||
/* Define if you have the <stdint.h> header file. */
|
||||
#ifndef _MSC_VER
|
||||
#define HAVE_STDINT_H 1
|
||||
#else /* _MSC_VER */
|
||||
/* #undef HAVE_STDINT_H */
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
/* Define if you have the <stdlib.h> header file. */
|
||||
#define HAVE_STDLIB_H 1
|
||||
@@ -236,7 +260,11 @@
|
||||
/* #undef HAVE_STPCPY */
|
||||
|
||||
/* Define if you have the `strcasecmp' function. */
|
||||
#ifndef _MSC_VER
|
||||
#define HAVE_STRCASECMP 1
|
||||
#else /* _MSC_VER */
|
||||
/* #undef HAVE_STRCASECMP */
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
/* Define if you have the `strchr' function. */
|
||||
#define HAVE_STRCHR 1
|
||||
@@ -257,7 +285,11 @@
|
||||
/* #undef HAVE_STRLCPY */
|
||||
|
||||
/* Define if you have the `strncasecmp' function. */
|
||||
#ifndef _MSC_VER
|
||||
#define HAVE_STRNCASECMP 1
|
||||
#else /* _MSC_VER */
|
||||
/* #undef HAVE_STRNCASECMP */
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
/* Define if you have the `strsignal' function. */
|
||||
/* #undef HAVE_STRSIGNAL */
|
||||
@@ -278,16 +310,31 @@
|
||||
/* #undef HAVE_SYS_TIMES_H */
|
||||
|
||||
/* Define if you have the <sys/time.h> header file. */
|
||||
#ifndef _MSC_VER
|
||||
#define HAVE_SYS_TIME_H 1
|
||||
#else /* _MSC_VER */
|
||||
/* #undef HAVE_SYS_TIME_H */
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
/* Define if you have the <sys/types.h> header file. */
|
||||
#define HAVE_SYS_TYPES_H 1
|
||||
|
||||
/* Define if you have the <unistd.h> header file. */
|
||||
#ifndef _MSC_VER
|
||||
#define HAVE_UNISTD_H 1
|
||||
#else /* _MSC_VER */
|
||||
/* #undef HAVE_UNISTD_H */
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
/* Define if you have the <values.h> header file. */
|
||||
#ifndef _MSC_VER
|
||||
#define HAVE_VALUES_H 1
|
||||
#else /* _MSC_VER */
|
||||
/* #undef HAVE_VALUES_H */
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
/* Define if you have the `vasprintf' function. */
|
||||
/* #undef HAVE_VASPRINTF */
|
||||
|
||||
/* Define if you have the `vprintf' function. */
|
||||
#define HAVE_VPRINTF 1
|
||||
@@ -341,7 +388,11 @@
|
||||
#define SIZEOF_LONG 4
|
||||
|
||||
/* The size of a `long long', as computed by sizeof. */
|
||||
#ifndef _MSC_VER
|
||||
#define SIZEOF_LONG_LONG 8
|
||||
#else /* _MSC_VER */
|
||||
#define SIZEOF_LONG_LONG 0
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
/* The size of a `short', as computed by sizeof. */
|
||||
#define SIZEOF_SHORT 2
|
||||
@@ -349,6 +400,9 @@
|
||||
/* The size of a `void *', as computed by sizeof. */
|
||||
#define SIZEOF_VOID_P 4
|
||||
|
||||
/* The size of a `__int64', as computed by sizeof. */
|
||||
#define SIZEOF___INT64 8
|
||||
|
||||
/* If using the C implementation of alloca, define if you know the
|
||||
direction of stack growth for your system; otherwise it will be
|
||||
automatically deduced at run-time.
|
||||
@@ -369,7 +423,11 @@
|
||||
|
||||
/* Define as `__inline' if that's what the C compiler calls it, or to nothing
|
||||
if it is not supported. */
|
||||
#ifndef _MSC_VER
|
||||
/* #undef inline */
|
||||
#else /* _MSC_VER */
|
||||
#define inline __inline
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
/* Define to `long' if <sys/types.h> does not define. */
|
||||
/* #undef off_t */
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/* glibconfig.h.win32
|
||||
/* glibconfig.h
|
||||
*
|
||||
* This is a based on a generated file. Please modify 'configure.in'
|
||||
* This is a generated file. Please modify 'configure.in'
|
||||
*/
|
||||
|
||||
#ifndef __G_LIBCONFIG_H__
|
||||
@@ -39,15 +39,19 @@ typedef unsigned int guint32;
|
||||
#define G_GUINT32_FORMAT "u"
|
||||
#define G_HAVE_GINT64 1
|
||||
|
||||
#ifdef _MSC_VER
|
||||
typedef __int64 gint64;
|
||||
#ifndef _MSC_VER
|
||||
G_GNUC_EXTENSION typedef signed long long gint64;
|
||||
G_GNUC_EXTENSION typedef unsigned long long guint64;
|
||||
#else /* _MSC_VER */
|
||||
typedef signed __int64 gint64;
|
||||
typedef unsigned __int64 guint64;
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
#ifndef _MSC_VER
|
||||
#define G_GINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##LL))
|
||||
#else /* _MSC_VER */
|
||||
#define G_GINT64_CONSTANT(val) (val##i64)
|
||||
#elif __GNUC__
|
||||
typedef long long gint64;
|
||||
typedef unsigned long long guint64;
|
||||
#define G_GINT64_CONSTANT(val) (val##LL)
|
||||
#endif
|
||||
#endif /* _MSC_VER */
|
||||
#define G_GINT64_FORMAT "I64i"
|
||||
#define G_GUINT64_FORMAT "I64u"
|
||||
|
||||
@@ -83,17 +87,24 @@ typedef guint32 gsize;
|
||||
#ifdef __cplusplus
|
||||
#define G_HAVE_INLINE 1
|
||||
#else /* !__cplusplus */
|
||||
#ifndef _MSC_VER
|
||||
#define G_HAVE_INLINE 1
|
||||
#else /* _MSC_VER */
|
||||
|
||||
#endif /* _MSC_VER */
|
||||
#define G_HAVE___INLINE 1
|
||||
#ifndef _MSC_VER
|
||||
#define G_HAVE___INLINE__ 1
|
||||
#endif /* not _MSC_VER */
|
||||
#endif /* !__cplusplus */
|
||||
|
||||
#ifndef _MSC_VER
|
||||
#ifndef __cplusplus
|
||||
# define G_HAVE_ISO_VARARGS 1
|
||||
#endif
|
||||
|
||||
#ifdef __GNUC__
|
||||
#define G_HAVE_GNUC_VARARGS 1
|
||||
#endif
|
||||
#endif /* not _MSC_VER */
|
||||
|
||||
|
||||
#define G_THREADS_ENABLED
|
||||
|
||||
@@ -1,3 +1,9 @@
|
||||
2001-09-26 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* makefile.mingw.in: Fix couple of typos.
|
||||
|
||||
* gthread.def: Add g_thread_init_with_errorcheck_mutexes.
|
||||
|
||||
2001-09-25 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* gthread-impl.c: Corrected the array size (cough, cough). Pointed
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
EXPORTS
|
||||
g_thread_init
|
||||
g_thread_init_with_errorcheck_mutexes
|
||||
|
||||
@@ -20,8 +20,8 @@ all : \
|
||||
gthread_OBJECTS = \
|
||||
gthread-impl.o
|
||||
|
||||
libgthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.a : $(gthread_OBJECTS) gthread.def gthread-@GLIB_VERSION@.rc
|
||||
$(BUILD_DLL) gthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ @LT_CURRENT:@LT_REVISION@:@LT_AGE@ gthread.def $(gthread_OBJECTS) -L ../glib -lglib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
|
||||
libgthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.a : $(gthread_OBJECTS) gthread.def gthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.rc
|
||||
$(BUILD_DLL) gthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ @LT_CURRENT@:@LT_REVISION@:@LT_AGE@ gthread.def $(gthread_OBJECTS) -L ../glib -lglib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
|
||||
|
||||
gthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.rc : gthread.rc
|
||||
cp $< $@
|
||||
|
||||
@@ -49,7 +49,7 @@ all: $(TESTS) $(DLLS)
|
||||
.SUFFIXES: .c .i .exe
|
||||
|
||||
.c.exe:
|
||||
$(CC) $(CFLAGS) -o $@ $< -L ../gthread -lgthread -L ../glib -lglib-1.3
|
||||
$(CC) $(CFLAGS) -o $@ $< -L ../gthread -lgthread-1.3 -L ../glib -lglib-1.3
|
||||
|
||||
module-test.exe : module-test.o
|
||||
$(CC) $(CFLAGS) -Wl,--base-file,module-test.base -o module-test.exe module-test.o -L ../glib -lglib-1.3 -L ../gmodule -lgmodule-1.3 $(LDFLAGS)
|
||||
|
||||
Reference in New Issue
Block a user