summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog25
-rw-r--r--ChangeLog.pre-2-1025
-rw-r--r--ChangeLog.pre-2-1225
-rw-r--r--ChangeLog.pre-2-425
-rw-r--r--ChangeLog.pre-2-625
-rw-r--r--ChangeLog.pre-2-825
-rw-r--r--config.h.win32.in239
-rw-r--r--configure.in16
-rw-r--r--glib/gconvert.c2
-rw-r--r--glib/glib.def7
-rw-r--r--glib/gnulib/g-gnulib.h1
-rw-r--r--glib/gutils.c9
-rw-r--r--glibconfig.h.win32.in23
-rw-r--r--tests/gobject/Makefile.am2
-rw-r--r--tests/gobject/ifaceproperties.c6
15 files changed, 311 insertions, 144 deletions
diff --git a/ChangeLog b/ChangeLog
index d928690fc..19d55ccdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2003-10-24 Tor Lillqvist <tml@iki.fi>
+
+ * configure.in: Force shared library (DLL) only on Windows.
+ (I don't think that is controversial?) Remove unnecessary
+ AC_LIBTOOL_WIN32_DLL. Don't use -D_REENTRANT on
+ Win32, it is not used by mingw or MSVC headers.
+
+ * config.h.win32.in
+ * glibconfig.h.win32.in: Match what configure produces.
+
+ * glib/gconvert.c
+ * glib/gutils.c: Mark a couple of functions and variables that
+ aren't public as static.
+
+ * glib/gnulib/g-gnulib.h: Undef HAVE_SNPRINTF before (re)defining
+ it potentially differently, to silence compiler.
+
+ * glib/glib.def: Add some missing entries.
+
+ * tests/gobject/Makefile.am (LDADD): Reorder, put libgobject after
+ libtestgobject.
+
+ * tests/gobject/ifaceproperties.c (main): NULL-terminate arg list
+ to g_object_set() and _get().
+
Thu Oct 23 12:38:24 2003 Owen Taylor <otaylor@redhat.com>
* === Released 2.3.0 ===
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d928690fc..19d55ccdc 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,28 @@
+2003-10-24 Tor Lillqvist <tml@iki.fi>
+
+ * configure.in: Force shared library (DLL) only on Windows.
+ (I don't think that is controversial?) Remove unnecessary
+ AC_LIBTOOL_WIN32_DLL. Don't use -D_REENTRANT on
+ Win32, it is not used by mingw or MSVC headers.
+
+ * config.h.win32.in
+ * glibconfig.h.win32.in: Match what configure produces.
+
+ * glib/gconvert.c
+ * glib/gutils.c: Mark a couple of functions and variables that
+ aren't public as static.
+
+ * glib/gnulib/g-gnulib.h: Undef HAVE_SNPRINTF before (re)defining
+ it potentially differently, to silence compiler.
+
+ * glib/glib.def: Add some missing entries.
+
+ * tests/gobject/Makefile.am (LDADD): Reorder, put libgobject after
+ libtestgobject.
+
+ * tests/gobject/ifaceproperties.c (main): NULL-terminate arg list
+ to g_object_set() and _get().
+
Thu Oct 23 12:38:24 2003 Owen Taylor <otaylor@redhat.com>
* === Released 2.3.0 ===
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index d928690fc..19d55ccdc 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,28 @@
+2003-10-24 Tor Lillqvist <tml@iki.fi>
+
+ * configure.in: Force shared library (DLL) only on Windows.
+ (I don't think that is controversial?) Remove unnecessary
+ AC_LIBTOOL_WIN32_DLL. Don't use -D_REENTRANT on
+ Win32, it is not used by mingw or MSVC headers.
+
+ * config.h.win32.in
+ * glibconfig.h.win32.in: Match what configure produces.
+
+ * glib/gconvert.c
+ * glib/gutils.c: Mark a couple of functions and variables that
+ aren't public as static.
+
+ * glib/gnulib/g-gnulib.h: Undef HAVE_SNPRINTF before (re)defining
+ it potentially differently, to silence compiler.
+
+ * glib/glib.def: Add some missing entries.
+
+ * tests/gobject/Makefile.am (LDADD): Reorder, put libgobject after
+ libtestgobject.
+
+ * tests/gobject/ifaceproperties.c (main): NULL-terminate arg list
+ to g_object_set() and _get().
+
Thu Oct 23 12:38:24 2003 Owen Taylor <otaylor@redhat.com>
* === Released 2.3.0 ===
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d928690fc..19d55ccdc 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,28 @@
+2003-10-24 Tor Lillqvist <tml@iki.fi>
+
+ * configure.in: Force shared library (DLL) only on Windows.
+ (I don't think that is controversial?) Remove unnecessary
+ AC_LIBTOOL_WIN32_DLL. Don't use -D_REENTRANT on
+ Win32, it is not used by mingw or MSVC headers.
+
+ * config.h.win32.in
+ * glibconfig.h.win32.in: Match what configure produces.
+
+ * glib/gconvert.c
+ * glib/gutils.c: Mark a couple of functions and variables that
+ aren't public as static.
+
+ * glib/gnulib/g-gnulib.h: Undef HAVE_SNPRINTF before (re)defining
+ it potentially differently, to silence compiler.
+
+ * glib/glib.def: Add some missing entries.
+
+ * tests/gobject/Makefile.am (LDADD): Reorder, put libgobject after
+ libtestgobject.
+
+ * tests/gobject/ifaceproperties.c (main): NULL-terminate arg list
+ to g_object_set() and _get().
+
Thu Oct 23 12:38:24 2003 Owen Taylor <otaylor@redhat.com>
* === Released 2.3.0 ===
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d928690fc..19d55ccdc 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,28 @@
+2003-10-24 Tor Lillqvist <tml@iki.fi>
+
+ * configure.in: Force shared library (DLL) only on Windows.
+ (I don't think that is controversial?) Remove unnecessary
+ AC_LIBTOOL_WIN32_DLL. Don't use -D_REENTRANT on
+ Win32, it is not used by mingw or MSVC headers.
+
+ * config.h.win32.in
+ * glibconfig.h.win32.in: Match what configure produces.
+
+ * glib/gconvert.c
+ * glib/gutils.c: Mark a couple of functions and variables that
+ aren't public as static.
+
+ * glib/gnulib/g-gnulib.h: Undef HAVE_SNPRINTF before (re)defining
+ it potentially differently, to silence compiler.
+
+ * glib/glib.def: Add some missing entries.
+
+ * tests/gobject/Makefile.am (LDADD): Reorder, put libgobject after
+ libtestgobject.
+
+ * tests/gobject/ifaceproperties.c (main): NULL-terminate arg list
+ to g_object_set() and _get().
+
Thu Oct 23 12:38:24 2003 Owen Taylor <otaylor@redhat.com>
* === Released 2.3.0 ===
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d928690fc..19d55ccdc 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,28 @@
+2003-10-24 Tor Lillqvist <tml@iki.fi>
+
+ * configure.in: Force shared library (DLL) only on Windows.
+ (I don't think that is controversial?) Remove unnecessary
+ AC_LIBTOOL_WIN32_DLL. Don't use -D_REENTRANT on
+ Win32, it is not used by mingw or MSVC headers.
+
+ * config.h.win32.in
+ * glibconfig.h.win32.in: Match what configure produces.
+
+ * glib/gconvert.c
+ * glib/gutils.c: Mark a couple of functions and variables that
+ aren't public as static.
+
+ * glib/gnulib/g-gnulib.h: Undef HAVE_SNPRINTF before (re)defining
+ it potentially differently, to silence compiler.
+
+ * glib/glib.def: Add some missing entries.
+
+ * tests/gobject/Makefile.am (LDADD): Reorder, put libgobject after
+ libtestgobject.
+
+ * tests/gobject/ifaceproperties.c (main): NULL-terminate arg list
+ to g_object_set() and _get().
+
Thu Oct 23 12:38:24 2003 Owen Taylor <otaylor@redhat.com>
* === Released 2.3.0 ===
diff --git a/config.h.win32.in b/config.h.win32.in
index 480bf4358..7c58713a2 100644
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -1,62 +1,6 @@
/* config.h.win32.in Merged from two versions generated by configure for gcc and MSVC. */
+/* config.h. 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
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/* acconfig.h
- This file is in the public domain.
-
- Descriptive text for the C preprocessor macros that
- the distributed Autoconf macros can define.
- No software package will use all of them; autoheader copies the ones
- your configure.in uses into your configuration header file templates.
-
- The entries are in sort -df order: alphabetical, case insensitive,
- ignoring punctuation (such as underscores). Although this order
- can split up related entries, it makes it easier to check whether
- a given entry is in the file.
-
- Leave the following blank line there!! Autoheader needs it. */
-
-
-/* Other stuff */
-
-/* #undef PACKAGE */
-/* #undef VERSION */
-
-
-/* Leave that blank line there!! Autoheader needs it.
- If you're adding to this file, keep in mind:
- The entries are in sort -df order: alphabetical, case insensitive,
- ignoring punctuation (such as underscores). */
-
-#define ENABLE_NLS 1
-#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
-#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_GNU Using GNU libiconv
-/* #undef USE_LIBICONV_NATIVE */
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
systems. This function is required for `alloca.c' support on those systems.
@@ -75,6 +19,9 @@
/* always defined to indicate that i18n is enabled */
#define ENABLE_NLS 1
+/* Define the gettext package to be used */
+#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
+
/* Define to the GLIB binary age */
#define GLIB_BINARY_AGE @GLIB_BINARY_AGE@
@@ -84,6 +31,9 @@
/* Define to the GLIB interface age */
#define GLIB_INTERFACE_AGE @GLIB_INTERFACE_AGE@
+/* Define the location where the catalogs will be installed */
+#define GLIB_LOCALE_DIR "NONE/lib/locale"
+
/* Define to the GLIB major version */
#define GLIB_MAJOR_VERSION @GLIB_MAJOR_VERSION@
@@ -93,23 +43,10 @@
/* Define to the GLIB minor version */
#define GLIB_MINOR_VERSION @GLIB_MINOR_VERSION@
-/* Size of gmutex */
+/* The size of gmutex, as computed by sizeof. */
/* #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
-
-/* Size of size_t */
-#define GLIB_SIZEOF_SIZE_T 4
-
-/* Size of system_thread */
+/* The size of system_thread, as computed by sizeof. */
#define GLIB_SIZEOF_SYSTEM_THREAD 4
/* Whether glib was compiled with debugging enabled */
@@ -139,7 +76,11 @@
/* #undef G_THREAD_USE_PID_SURROGATE */
/* A 'va_copy' style function */
+#ifndef _MSC_VER
+#define G_VA_COPY va_copy
+#else /* _MSC_VER */
/* #undef G_VA_COPY */
+#endif /* _MSC_VER */
/* 'va_lists' cannot be copies as values */
/* #undef G_VA_COPY_AS_ARRAY */
@@ -151,15 +92,16 @@
*/
/* #undef HAVE_ALLOCA_H */
-/* Define to 1 if you have the <argz.h> header file. */
-/* #undef HAVE_ARGZ_H */
-
/* Define to 1 if you have the `atexit' function. */
#define HAVE_ATEXIT 1
/* Define to 1 if you have the `bind_textdomain_codeset' function. */
#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+/* Define if you have a version of the snprintf function with semantics as
+ specified by the ISO C99 standard. */
+/* #undef HAVE_C99_SNPRINTF */
+
/* Define if you have a version of the vsnprintf function with semantics as
specified by the ISO C99 standard. */
/* #undef HAVE_C99_VSNPRINTF */
@@ -188,21 +130,26 @@
/* Define to 1 if you have the `getc_unlocked' function. */
/* #undef HAVE_GETC_UNLOCKED */
-/* Define to 1 if you have the `getpagesize' function. */
-#ifndef _MSC_VER
-#define HAVE_GETPAGESIZE 1
-#else /* _MSC_VER */
-/* #undef HAVE_GETPAGESIZE */
-#endif /* _MSC_VER */
-
/* Define if the GNU gettext() function is already present or preinstalled. */
#define HAVE_GETTEXT 1
/* define to use system printf */
/* #undef HAVE_GOOD_PRINTF */
-/* Define to 1 if you have the <inttypes.h> header file. */
+/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
+#ifndef _MSC_VER
+#define HAVE_INTMAX_T 1
+#else /* _MSC_VER */
+/* #undef HAVE_INTMAX_T */
+#endif /* _MSC_VER */
+
+/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
+ declares uintmax_t. */
+#ifndef _MSC_VER
+#define HAVE_INTTYPES_H 1
+#else /* _MSC_VER */
/* #undef HAVE_INTTYPES_H */
+#endif /* _MSC_VER */
/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
/* #undef HAVE_LANGINFO_CODESET */
@@ -222,12 +169,22 @@
/* Define to 1 if you have the `localtime_r' function. */
/* #undef HAVE_LOCALTIME_R */
+/* Define if you have the 'long double' type. */
+#define HAVE_LONG_DOUBLE 1
+
+/* Define if you have the 'long long' type. */
+#ifndef _MSC_VER
+#define HAVE_LONG_LONG 1
+#else /* _MSC_VER */
+/* #undef HAVE_LONG_LONG */
+#endif /* _MSC_VER */
+
+/* define if system printf can print long long */
+#define HAVE_LONG_LONG_FORMAT 1
+
/* Define to 1 if you have the `lstat' function. */
/* #undef HAVE_LSTAT */
-/* Define to 1 if you have the <malloc.h> header file. */
-#define HAVE_MALLOC_H 1
-
/* Define to 1 if you have the `memmove' function. */
#define HAVE_MEMMOVE 1
@@ -237,21 +194,12 @@
/* Define to 1 if you have the `mkstemp' function. */
/* #undef HAVE_MKSTEMP */
-/* Define to 1 if you have a working `mmap' system call. */
-/* #undef HAVE_MMAP */
-
-/* Define to 1 if you have the `munmap' function. */
-/* #undef HAVE_MUNMAP */
-
/* Define to 1 if you have the `nanosleep' function. */
/* #undef HAVE_NANOSLEEP */
/* Define to 1 if you have the `nl_langinfo' function. */
/* #undef HAVE_NL_LANGINFO */
-/* Define to 1 if you have the <nl_types.h> header file. */
-/* #undef HAVE_NL_TYPES_H */
-
/* Have non-POSIX function getpwuid_r */
/* #undef HAVE_NONPOSIX_GETPWUID_R */
@@ -267,12 +215,15 @@
/* Have function pthread_attr_setstacksize */
/* #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE */
-/* Define to 1 if you have the `putenv' function. */
-#define HAVE_PUTENV 1
+/* Define to 1 if the system has the type `ptrdiff_t'. */
+#define HAVE_PTRDIFF_T 1
/* Define to 1 if you have the <pwd.h> header file. */
/* #undef HAVE_PWD_H */
+/* Define to 1 if you have the `readlink' function. */
+/* #undef HAVE_READLINK */
+
/* Define to 1 if you have the <sched.h> header file. */
/* #undef HAVE_SCHED_H */
@@ -282,6 +233,13 @@
/* Define to 1 if you have the `setlocale' function. */
#define HAVE_SETLOCALE 1
+/* Define to 1 if you have the `snprintf' function. */
+#ifndef _MSC_VER
+#define HAVE_SNPRINTF 1
+#else /* _MSC_VER */
+/* #undef HAVE_SNPRINTF */
+#endif /* _MSC_VER */
+
/* Define to 1 if you have the <stddef.h> header file. */
#define HAVE_STDDEF_H 1
@@ -292,6 +250,14 @@
/* #undef HAVE_STDINT_H */
#endif /* _MSC_VER */
+/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
+ uintmax_t. */
+#ifndef _MSC_VER
+#define HAVE_STDINT_H_WITH_UINTMAX 1
+#else /* _MSC_VER */
+/* #undef HAVE_STDINT_H_WITH_UINTMAX */
+#endif /* _MSC_VER */
+
/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
@@ -305,17 +271,15 @@
/* #undef HAVE_STRCASECMP */
#endif /* _MSC_VER */
-/* Define to 1 if you have the `strchr' function. */
-#define HAVE_STRCHR 1
-
-/* Define to 1 if you have the `strdup' function. */
-#define HAVE_STRDUP 1
-
/* Define to 1 if you have the `strerror' function. */
#define HAVE_STRERROR 1
/* Define to 1 if you have the <strings.h> header file. */
+#ifndef _MSC_VER
+#define HAVE_STRINGS_H 1
+#else /* _MSC_VER */
/* #undef HAVE_STRINGS_H */
+#endif /* _MSC_VER */
/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1
@@ -333,8 +297,15 @@
/* Define to 1 if you have the `strsignal' function. */
/* #undef HAVE_STRSIGNAL */
+/* Define to 1 if you have the `symlink' function. */
+/* #undef HAVE_SYMLINK */
+
/* Define to 1 if you have the <sys/param.h> header file. */
+#ifndef _MSC_VER
+#define HAVE_SYS_PARAM_H 1
+#else /* _MSC_VER */
/* #undef HAVE_SYS_PARAM_H */
+#endif /* _MSC_VER */
/* Define to 1 if you have the <sys/poll.h> header file. */
/* #undef HAVE_SYS_POLL_H */
@@ -380,25 +351,26 @@
#endif /* _MSC_VER */
/* Define to 1 if you have the `vasprintf' function. */
-/* #undef HAVE_VASPRINTF */
+#define HAVE_VASPRINTF 1
/* Define to 1 if you have the `vprintf' function. */
#define HAVE_VPRINTF 1
/* Define to 1 if you have the `vsnprintf' function. */
+#ifndef _MSC_VER
+#define HAVE_VSNPRINTF 1
+#else /* _MSC_VER */
/* #undef HAVE_VSNPRINTF */
+#endif /* _MSC_VER */
-/* Have a working bcopy */
-/* #undef HAVE_WORKING_BCOPY */
-
-/* Define to 1 if you have the `__argz_count' function. */
-/* #undef HAVE___ARGZ_COUNT */
+/* Define if you have the 'wchar_t' type. */
+#define HAVE_WCHAR_T 1
-/* Define to 1 if you have the `__argz_next' function. */
-/* #undef HAVE___ARGZ_NEXT */
+/* Define if you have the 'wint_t' type. */
+#define HAVE_WINT_T 1
-/* Define to 1 if you have the `__argz_stringify' function. */
-/* #undef HAVE___ARGZ_STRINGIFY */
+/* Have a working bcopy */
+/* #undef HAVE_WORKING_BCOPY */
/* didn't find fd_set */
#define NO_FD_SET 1
@@ -412,23 +384,20 @@
/* global 'sys_siglist' not declared */
#define NO_SYS_SIGLIST_DECL 1
-/* Name of package */
-/* #undef PACKAGE */
-
/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
+#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=glib"
/* Define to the full name of this package. */
-#define PACKAGE_NAME ""
+#define PACKAGE_NAME "glib"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
+#define PACKAGE_STRING "glib @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.@GLIB_MICRO_VERSION@"
/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
+#define PACKAGE_TARNAME "glib"
/* Define to the version of this package. */
-#define PACKAGE_VERSION ""
+#define PACKAGE_VERSION "@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.@GLIB_MICRO_VERSION@"
/* Maximum POSIX RT priority */
/* #undef POSIX_MAX_PRIORITY */
@@ -442,6 +411,13 @@
/* whether realloc (NULL,) works */
#define REALLOC_0_WORKS 1
+/* Define if you have correct malloc prototypes */
+#ifndef _MSC_VER
+#define SANE_MALLOC_PROTOS 1
+#else /* _MSC_VER */
+/* #undef SANE_MALLOC_PROTOS */
+#endif /* _MSC_VER */
+
/* The size of a `char', as computed by sizeof. */
#define SIZEOF_CHAR 1
@@ -461,6 +437,9 @@
/* The size of a `short', as computed by sizeof. */
#define SIZEOF_SHORT 2
+/* The size of a `size_t', as computed by sizeof. */
+#define SIZEOF_SIZE_T 4
+
/* The size of a `void *', as computed by sizeof. */
#define SIZEOF_VOID_P 4
@@ -478,8 +457,11 @@
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
-/* Version number of package */
-/* #undef VERSION */
+/* Using GNU libiconv */
+#define USE_LIBICONV_GNU 1
+
+/* Using a native implementation of iconv in a separate library */
+/* #undef USE_LIBICONV_NATIVE */
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
@@ -494,16 +476,15 @@
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
- if it is not supported. */
+/* Define to long or long long if <inttypes.h> and <stdint.h> don't define. */
#ifndef _MSC_VER
-/* #undef inline */
+/* #undef intmax_t */
#else /* _MSC_VER */
-#define inline __inline
+#define intmax_t long
#endif /* _MSC_VER */
-/* Define to `long' if <sys/types.h> does not define. */
-/* #undef off_t */
+/* Define to empty if the C compiler doesn't support this keyword. */
+/* #undef signed */
/* Define to `unsigned' if <sys/types.h> does not define. */
/* #undef size_t */
diff --git a/configure.in b/configure.in
index 378bcb3a7..a69f1dd25 100644
--- a/configure.in
+++ b/configure.in
@@ -215,6 +215,17 @@ else
AC_MSG_RESULT([yes])
fi
+if test "$glib_native_win32" = "yes"; then
+ if test x$enable_static = xyes -o x$enable_static = x; then
+ AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.])
+ enable_static=no
+ fi
+ if test x$enable_shared = xno; then
+ AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.])
+ fi
+ enable_shared=yes
+fi
+
dnl Checks for programs.
AC_PROG_CC
@@ -410,7 +421,6 @@ esac
dnl Initialize libtool
AM_DISABLE_STATIC
-AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
if test "x$GCC" = "xyes"; then
@@ -1466,6 +1476,10 @@ if test x"$have_threads" != xno; then
G_THREAD_CFLAGS="-Kthread"
G_THREAD_LIBS=$G_THREAD_CFLAGS
;;
+ *-mingw*)
+ # No flag needed when using MSVCRT.DLL
+ G_THREAD_CFLAGS=""
+ ;;
*)
G_THREAD_CFLAGS="-D_REENTRANT" # good default guess otherwise
;;
diff --git a/glib/gconvert.c b/glib/gconvert.c
index 35dd7af49..0e7d02971 100644
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -236,7 +236,7 @@ iconv_cache_init (void)
*
* Returns a pointer to the newly allocated cache bucket.
**/
-struct _iconv_cache_bucket *
+static struct _iconv_cache_bucket *
iconv_cache_bucket_new (const gchar *key, GIConv cd)
{
struct _iconv_cache_bucket *bucket;
diff --git a/glib/glib.def b/glib/glib.def
index 8eb19e8a7..61a7f7e2d 100644
--- a/glib/glib.def
+++ b/glib/glib.def
@@ -75,6 +75,7 @@ EXPORTS
g_completion_free
g_completion_new
g_completion_remove_items
+ g_completion_set_compare
g_convert
g_convert_error_quark
g_convert_with_fallback
@@ -286,6 +287,7 @@ EXPORTS
g_list_pop_allocator
g_list_position
g_list_prepend
+ g_list_push_allocator
g_list_remove
g_list_remove_all
g_list_remove_link
@@ -339,6 +341,8 @@ EXPORTS
g_markup_parse_context_get_position
g_markup_parse_context_new
g_markup_parse_context_parse
+ g_markup_printf_escaped
+ g_markup_vprintf_escaped
g_mem_chunk_alloc
g_mem_chunk_alloc0
g_mem_chunk_clean
@@ -633,7 +637,6 @@ EXPORTS
g_thread_create_full
g_thread_error_quark
g_thread_exit
- g_thread_exit
g_thread_functions_for_glib_use
g_thread_init_glib
g_thread_join
@@ -690,6 +693,7 @@ EXPORTS
g_ucs4_to_utf8
g_unichar_break_type
g_unichar_digit_value
+ g_unichar_get_mirror_char
g_unichar_isalnum
g_unichar_isalpha
g_unichar_iscntrl
@@ -740,6 +744,7 @@ EXPORTS
g_utf8_to_ucs4_fast
g_utf8_to_utf16
g_utf8_validate
+ g_vasprintf
g_vfprintf
g_vprintf
g_vsnprintf
diff --git a/glib/gnulib/g-gnulib.h b/glib/gnulib/g-gnulib.h
index 8fec93d66..c0d904f35 100644
--- a/glib/gnulib/g-gnulib.h
+++ b/glib/gnulib/g-gnulib.h
@@ -34,6 +34,7 @@
#define free g_free
/* Ensure only C99 snprintf gets used */
+#undef HAVE_SNPRINTF
#ifdef HAVE_C99_SNPRINTF
#define HAVE_SNPRINTF 1
#else
diff --git a/glib/gutils.c b/glib/gutils.c
index a90d3a351..570eab980 100644
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -173,7 +173,7 @@ my_strchrnul (const gchar *str, gchar c)
#ifdef G_OS_WIN32
-gchar *inner_find_program_in_path (const gchar *program);
+static gchar *inner_find_program_in_path (const gchar *program);
gchar*
g_find_program_in_path (const gchar *program)
@@ -240,6 +240,9 @@ g_find_program_in_path (const gchar *program)
*
* Return value: absolute path, or NULL
**/
+#ifdef G_OS_WIN32
+static
+#endif
gchar*
g_find_program_in_path (const gchar *program)
{
@@ -1064,7 +1067,7 @@ g_get_tmp_dir (void)
return g_tmp_dir;
}
-G_LOCK_DEFINE (g_prgname);
+G_LOCK_DEFINE_STATIC (g_prgname);
static gchar *g_prgname = NULL;
gchar*
@@ -1088,7 +1091,7 @@ g_set_prgname (const gchar *prgname)
G_UNLOCK (g_prgname);
}
-G_LOCK_DEFINE (g_application_name);
+G_LOCK_DEFINE_STATIC (g_application_name);
static gchar *g_application_name = NULL;
/**
diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in
index 533e687cc..704b6914b 100644
--- a/glibconfig.h.win32.in
+++ b/glibconfig.h.win32.in
@@ -28,18 +28,20 @@ G_BEGIN_DECLS
#define G_MAXLONG LONG_MAX
#define G_MAXULONG ULONG_MAX
-#define G_MININT64 ((gint64) 0x8000000000000000)
-#define G_MAXINT64 ((gint64) 0x7fffffffffffffff)
-#define G_MAXUINT64 ((guint64) 0xffffffffffffffff)
+#define G_MININT64 G_GINT64_CONSTANT(0x8000000000000000)
+#define G_MAXINT64 G_GINT64_CONSTANT(0x7fffffffffffffff)
+#define G_MAXUINT64 G_GINT64_CONSTANT(0xffffffffffffffffU)
typedef signed char gint8;
typedef unsigned char guint8;
typedef signed short gint16;
typedef unsigned short guint16;
+#define G_GINT16_MODIFIER "h"
#define G_GINT16_FORMAT "hi"
#define G_GUINT16_FORMAT "hu"
typedef signed int gint32;
typedef unsigned int guint32;
+#define G_GINT32_MODIFIER ""
#define G_GINT32_FORMAT "i"
#define G_GUINT32_FORMAT "u"
#define G_HAVE_GINT64 1 /* deprecated, always true */
@@ -57,8 +59,9 @@ typedef unsigned __int64 guint64;
#else /* _MSC_VER */
#define G_GINT64_CONSTANT(val) (val##i64)
#endif /* _MSC_VER */
-#define G_GINT64_FORMAT "I64i"
-#define G_GUINT64_FORMAT "I64u"
+#define G_GINT64_MODIFIER "ll"
+#define G_GINT64_FORMAT "lli"
+#define G_GUINT64_FORMAT "llu"
#define GLIB_SIZEOF_VOID_P 4
#define GLIB_SIZEOF_LONG 4
@@ -72,6 +75,7 @@ typedef unsigned int gsize;
#define GINT_TO_POINTER(i) ((gpointer) (i))
#define GUINT_TO_POINTER(u) ((gpointer) (u))
+
#ifdef NeXT /* @#%@! NeXTStep */
# define g_ATEXIT(proc) (!atexit (proc))
#else
@@ -130,7 +134,14 @@ typedef unsigned int gsize;
#define G_THREADS_IMPL_WIN32
typedef struct _GMutex* GStaticMutex;
#define G_STATIC_MUTEX_INIT NULL
-#define g_static_mutex_get_mutex(mutex) (g_static_mutex_get_mutex_impl (mutex))
+#define g_static_mutex_get_mutex(mutex) \
+ (g_static_mutex_get_mutex_impl_shortcut (mutex))
+/* double checked locking can be used on this platform */
+#define g_once(once, func, arg) \
+ ((once)->status == G_ONCE_STATUS_READY ? (once)->retval : \
+ g_once_impl (once, func, arg));
+#define g_static_mutex_get_mutex_impl_shortcut(mutex) \
+ (*(mutex) ? *(mutex) : g_static_mutex_get_mutex_impl (mutex))
/* This represents a system thread as used by the implementation. An
* alien implementaion, as loaded by g_thread_init can only count on
* "sizeof (gpointer)" bytes to store their info. We however need more
diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am
index b1f212f4b..b09d4de62 100644
--- a/tests/gobject/Makefile.am
+++ b/tests/gobject/Makefile.am
@@ -43,7 +43,7 @@ CLEANFILES = stamp-testmarshal.h
########################################################################
-LDADD = $(libgobject) libtestgobject.la
+LDADD = libtestgobject.la $(libgobject)
test_programs = \
accumulator \
diff --git a/tests/gobject/ifaceproperties.c b/tests/gobject/ifaceproperties.c
index f8ecd83eb..382edd549 100644
--- a/tests/gobject/ifaceproperties.c
+++ b/tests/gobject/ifaceproperties.c
@@ -442,12 +442,14 @@ main (gint argc,
"prop1", 0x0101,
"prop2", 0x0202,
"prop3", 0x0303,
- "prop4", 0x0404);
+ "prop4", 0x0404,
+ NULL);
g_object_get (object,
"prop1", &val1,
"prop2", &val2,
"prop3", &val3,
- "prop4", &val4);
+ "prop4", &val4,
+ NULL);
g_assert (val1 == 0x0101);
g_assert (val2 == 0x0202);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-10-23 12:28:56 +0000