glib2 1.1.8-x86-mingw32 → 1.1.9-x86-mingw32

data/vendor/local/include/glib-2.0/glib/gstdio.h

@@ -60,6 +60,7 @@ typedef struct stat GStatBuf;
  * in a portable system header that we could include here.
  */
 
+#ifndef __GTK_DOC_IGNORE__
 #define g_chmod   chmod
 #define g_open    open
 #define g_creat   creat
@@ -71,6 +72,7 @@ typedef struct stat GStatBuf;
 #define g_fopen   fopen
 #define g_freopen freopen
 #define g_utime   utime
+#endif
 
 int g_access (const gchar *filename,
 	      int          mode);
@@ -87,7 +89,7 @@ int g_rmdir  (const gchar *filename);
  * Unix, the pathname is a file name as it literally is in the file
  * system. On well-maintained systems with consistent users who know
  * what they are doing and no exchange of files with others this would
- * be a well-defined encoding, preferrably UTF-8. On Windows, the
+ * be a well-defined encoding, preferably UTF-8. On Windows, the
  * pathname is always in UTF-8, even if that is not the on-disk
  * encoding, and not the encoding accepted by the C library or Win32
  * API.

data/vendor/local/include/glib-2.0/glib/gstrfuncs.h

@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
@@ -103,9 +103,9 @@ gchar*	              g_strdelimit     (gchar	     *string,
 gchar*	              g_strcanon       (gchar        *string,
 					const gchar  *valid_chars,
 					gchar         substitutor);
-G_CONST_RETURN gchar* g_strerror       (gint	      errnum) G_GNUC_CONST;
-G_CONST_RETURN gchar* g_strsignal      (gint	      signum) G_GNUC_CONST;
-gchar*	              g_strreverse     (gchar	     *string);
+const gchar *         g_strerror       (gint	      errnum) G_GNUC_CONST;
+const gchar *         g_strsignal      (gint	      signum) G_GNUC_CONST;
+gchar *	              g_strreverse     (gchar	     *string);
 gsize	              g_strlcpy	       (gchar	     *dest,
 					const gchar  *src,
 					gsize         dest_size);
@@ -167,22 +167,19 @@ gchar*                g_ascii_strdown     (const gchar *str,
 gchar*                g_ascii_strup       (const gchar *str,
 					   gssize       len) G_GNUC_MALLOC;
 
-#ifndef G_DISABLE_DEPRECATED
 
-/* The following four functions are deprecated and will be removed in
- * the next major release. They use the locale-specific tolower and
- * toupper, which is almost never the right thing.
- */
-
-gint	              g_strcasecmp     (const gchar *s1,
-					const gchar *s2);
-gint	              g_strncasecmp    (const gchar *s1,
-					const gchar *s2,
-					guint        n);
-gchar*	              g_strdown	       (gchar	     *string);
-gchar*	              g_strup	       (gchar	     *string);
+GLIB_DEPRECATED
+gint                  g_strcasecmp     (const gchar *s1,
+                                        const gchar *s2);
+GLIB_DEPRECATED
+gint                  g_strncasecmp    (const gchar *s1,
+                                        const gchar *s2,
+                                        guint        n);
+GLIB_DEPRECATED
+gchar*                g_strdown        (gchar       *string);
+GLIB_DEPRECATED
+gchar*                g_strup          (gchar       *string);
 
-#endif /* G_DISABLE_DEPRECATED */
 
 /* String utility functions that return a newly allocated string which
  * ought to be freed with g_free from the caller at some point.
@@ -245,25 +242,6 @@ guint                 g_strv_length    (gchar       **str_array);
 gchar*                g_stpcpy         (gchar        *dest,
                                         const char   *src);
 
-G_CONST_RETURN gchar *g_strip_context  (const gchar *msgid, 
-					const gchar *msgval) G_GNUC_FORMAT(1);
-
-G_CONST_RETURN gchar *g_dgettext       (const gchar *domain,
-					const gchar *msgid) G_GNUC_FORMAT(2);
-G_CONST_RETURN gchar *g_dcgettext      (const gchar *domain,
-					const gchar *msgid,
-                                        int          category) G_GNUC_FORMAT(2);
-G_CONST_RETURN gchar *g_dngettext      (const gchar *domain,
-					const gchar *msgid,
-					const gchar *msgid_plural,
-					gulong       n) G_GNUC_FORMAT(3);
-G_CONST_RETURN gchar *g_dpgettext      (const gchar *domain,
-                                        const gchar *msgctxtid,
-                                        gsize        msgidoffset) G_GNUC_FORMAT(2);
-G_CONST_RETURN gchar *g_dpgettext2     (const gchar *domain,
-                                        const gchar *context,
-                                        const gchar *msgid) G_GNUC_FORMAT(3);
-
 G_END_DECLS
 
 #endif /* __G_STRFUNCS_H__ */

data/vendor/local/include/glib-2.0/glib/gstring.h

@@ -8,7 +8,7 @@
  *
  * 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
+ * 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
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
@@ -33,110 +33,96 @@
 
 #include <glib/gtypes.h>
 #include <glib/gunicode.h>
+#include <glib/gbytes.h>
 #include <glib/gutils.h>  /* for G_CAN_INLINE */
 
 G_BEGIN_DECLS
 
-typedef struct _GString		GString;
-typedef struct _GStringChunk	GStringChunk;
+typedef struct _GString         GString;
 
 struct _GString
 {
   gchar  *str;
-  gsize len;    
+  gsize len;
   gsize allocated_len;
 };
 
-/* String Chunks
- */
-GStringChunk* g_string_chunk_new	   (gsize size);  
-void	      g_string_chunk_free	   (GStringChunk *chunk);
-void	      g_string_chunk_clear	   (GStringChunk *chunk);
-gchar*	      g_string_chunk_insert	   (GStringChunk *chunk,
-					    const gchar	 *string);
-gchar*	      g_string_chunk_insert_len	   (GStringChunk *chunk,
-					    const gchar	 *string,
-					    gssize        len);
-gchar*	      g_string_chunk_insert_const  (GStringChunk *chunk,
-					    const gchar	 *string);
-
-
-/* Strings
- */
-GString*     g_string_new	        (const gchar	 *init);
+GString*     g_string_new               (const gchar     *init);
 GString*     g_string_new_len           (const gchar     *init,
-                                         gssize           len);   
-GString*     g_string_sized_new         (gsize            dfl_size);  
-gchar*	     g_string_free	        (GString	 *string,
-					 gboolean	  free_segment);
-gboolean     g_string_equal             (const GString	 *v,
-					 const GString 	 *v2);
+                                         gssize           len);
+GString*     g_string_sized_new         (gsize            dfl_size);
+gchar*       g_string_free              (GString         *string,
+                                         gboolean         free_segment);
+GLIB_AVAILABLE_IN_2_34
+GBytes*      g_string_free_to_bytes     (GString         *string);
+gboolean     g_string_equal             (const GString   *v,
+                                         const GString   *v2);
 guint        g_string_hash              (const GString   *str);
-GString*     g_string_assign            (GString	 *string,
-					 const gchar	 *rval);
-GString*     g_string_truncate          (GString	 *string,
-					 gsize		  len);    
+GString*     g_string_assign            (GString         *string,
+                                         const gchar     *rval);
+GString*     g_string_truncate          (GString         *string,
+                                         gsize            len);
 GString*     g_string_set_size          (GString         *string,
-					 gsize            len);
+                                         gsize            len);
 GString*     g_string_insert_len        (GString         *string,
-                                         gssize           pos,   
+                                         gssize           pos,
+                                         const gchar     *val,
+                                         gssize           len);
+GString*     g_string_append            (GString         *string,
+                                         const gchar     *val);
+GString*     g_string_append_len        (GString         *string,
+                                         const gchar     *val,
+                                         gssize           len);
+GString*     g_string_append_c          (GString         *string,
+                                         gchar            c);
+GString*     g_string_append_unichar    (GString         *string,
+                                         gunichar         wc);
+GString*     g_string_prepend           (GString         *string,
+                                         const gchar     *val);
+GString*     g_string_prepend_c         (GString         *string,
+                                         gchar            c);
+GString*     g_string_prepend_unichar   (GString         *string,
+                                         gunichar         wc);
+GString*     g_string_prepend_len       (GString         *string,
+                                         const gchar     *val,
+                                         gssize           len);
+GString*     g_string_insert            (GString         *string,
+                                         gssize           pos,
+                                         const gchar     *val);
+GString*     g_string_insert_c          (GString         *string,
+                                         gssize           pos,
+                                         gchar            c);
+GString*     g_string_insert_unichar    (GString         *string,
+                                         gssize           pos,
+                                         gunichar         wc);
+GString*     g_string_overwrite         (GString         *string,
+                                         gsize            pos,
+                                         const gchar     *val);
+GString*     g_string_overwrite_len     (GString         *string,
+                                         gsize            pos,
                                          const gchar     *val,
-                                         gssize           len);  
-GString*     g_string_append            (GString	 *string,
-			                 const gchar	 *val);
-GString*     g_string_append_len        (GString	 *string,
-			                 const gchar	 *val,
-                                         gssize           len);  
-GString*     g_string_append_c          (GString	 *string,
-					 gchar		  c);
-GString*     g_string_append_unichar    (GString	 *string,
-					 gunichar	  wc);
-GString*     g_string_prepend           (GString	 *string,
-					 const gchar	 *val);
-GString*     g_string_prepend_c         (GString	 *string,
-					 gchar		  c);
-GString*     g_string_prepend_unichar   (GString	 *string,
-					 gunichar	  wc);
-GString*     g_string_prepend_len       (GString	 *string,
-			                 const gchar	 *val,
-                                         gssize           len);  
-GString*     g_string_insert            (GString	 *string,
-					 gssize		  pos,    
-					 const gchar	 *val);
-GString*     g_string_insert_c          (GString	 *string,
-					 gssize		  pos,    
-					 gchar		  c);
-GString*     g_string_insert_unichar    (GString	 *string,
-					 gssize		  pos,    
-					 gunichar	  wc);
-GString*     g_string_overwrite         (GString	 *string,
-					 gsize		  pos,    
-					 const gchar	 *val);
-GString*     g_string_overwrite_len     (GString	 *string,
-					 gsize		  pos,    
-					 const gchar	 *val,
-					 gssize           len);
-GString*     g_string_erase	        (GString	 *string,
-					 gssize		  pos,
-					 gssize		  len);
-GString*     g_string_ascii_down        (GString	 *string);
-GString*     g_string_ascii_up          (GString	 *string);
-void         g_string_vprintf           (GString	 *string,
-					 const gchar	 *format,
-					 va_list          args);
-void         g_string_printf            (GString	 *string,
-					 const gchar	 *format,
-					 ...) G_GNUC_PRINTF (2, 3);
-void         g_string_append_vprintf    (GString	 *string,
-					 const gchar	 *format,
-					 va_list          args);
-void         g_string_append_printf     (GString	 *string,
-					 const gchar	 *format,
-					 ...) G_GNUC_PRINTF (2, 3);
-GString *    g_string_append_uri_escaped(GString         *string,
-					 const char      *unescaped,
-					 const char      *reserved_chars_allowed,
-					 gboolean         allow_utf8);
+                                         gssize           len);
+GString*     g_string_erase             (GString         *string,
+                                         gssize           pos,
+                                         gssize           len);
+GString*     g_string_ascii_down        (GString         *string);
+GString*     g_string_ascii_up          (GString         *string);
+void         g_string_vprintf           (GString         *string,
+                                         const gchar     *format,
+                                         va_list          args);
+void         g_string_printf            (GString         *string,
+                                         const gchar     *format,
+                                         ...) G_GNUC_PRINTF (2, 3);
+void         g_string_append_vprintf    (GString         *string,
+                                         const gchar     *format,
+                                         va_list          args);
+void         g_string_append_printf     (GString         *string,
+                                         const gchar     *format,
+                                         ...) G_GNUC_PRINTF (2, 3);
+GString*     g_string_append_uri_escaped (GString         *string,
+                                          const gchar     *unescaped,
+                                          const gchar     *reserved_chars_allowed,
+                                          gboolean         allow_utf8);
 
 /* -- optimize g_strig_append_c --- */
 #ifdef G_CAN_INLINE
@@ -157,21 +143,15 @@ g_string_append_c_inline (GString *gstring,
 #endif /* G_CAN_INLINE */
 
 
-#ifndef G_DISABLE_DEPRECATED
-
-/* The following two functions are deprecated and will be removed in
- * the next major release. They use the locale-specific tolower and
- * toupper, which is almost never the right thing.
- */
-
-GString*     g_string_down              (GString	 *string);
-GString*     g_string_up                (GString	 *string);
+GLIB_DEPRECATED
+GString *g_string_down (GString *string);
+GLIB_DEPRECATED
+GString *g_string_up   (GString *string);
 
-/* These aliases are included for compatibility. */
-#define	g_string_sprintf	g_string_printf
-#define	g_string_sprintfa	g_string_append_printf
-
-#endif /* G_DISABLE_DEPRECATED */
+#ifndef G_DISABLE_DEPRECATED
+#define  g_string_sprintf  g_string_printf
+#define  g_string_sprintfa g_string_append_printf
+#endif
 
 G_END_DECLS
 

data/vendor/local/include/glib-2.0/glib/gstringchunk.h

@@ -0,0 +1,53 @@
+/* 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.
+ */
+
+/*
+ * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GLib Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#error "Only <glib.h> can be included directly."
+#endif
+
+#ifndef __G_STRINGCHUNK_H__
+#define __G_STRINGCHUNK_H__
+
+#include <glib/gtypes.h>
+
+G_BEGIN_DECLS
+
+typedef struct _GStringChunk GStringChunk;
+
+GStringChunk* g_string_chunk_new          (gsize size);
+void          g_string_chunk_free         (GStringChunk *chunk);
+void          g_string_chunk_clear        (GStringChunk *chunk);
+gchar*        g_string_chunk_insert       (GStringChunk *chunk,
+                                           const gchar  *string);
+gchar*        g_string_chunk_insert_len   (GStringChunk *chunk,
+                                           const gchar  *string,
+                                           gssize        len);
+gchar*        g_string_chunk_insert_const (GStringChunk *chunk,
+                                           const gchar  *string);
+
+G_END_DECLS
+
+#endif /* __G_STRING_H__ */

data/vendor/local/include/glib-2.0/glib/gtestutils.h

@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
@@ -92,12 +92,14 @@ void    g_test_init                     (int            *argc,
                                          char         ***argv,
                                          ...);
 /* query testing framework config */
+#define g_test_initialized()            (g_test_config_vars->test_initialized)
 #define g_test_quick()                  (g_test_config_vars->test_quick)
 #define g_test_slow()                   (!g_test_config_vars->test_quick)
 #define g_test_thorough()               (!g_test_config_vars->test_quick)
 #define g_test_perf()                   (g_test_config_vars->test_perf)
 #define g_test_verbose()                (g_test_config_vars->test_verbose)
 #define g_test_quiet()                  (g_test_config_vars->test_quiet)
+#define g_test_undefined()              (g_test_config_vars->test_undefined)
 /* run all tests under toplevel suite (path: /) */
 int     g_test_run                      (void);
 /* hook up a test functions under test path */
@@ -108,6 +110,15 @@ void    g_test_add_data_func            (const char     *testpath,
                                          gconstpointer   test_data,
                                          GTestDataFunc   test_func);
 
+GLIB_AVAILABLE_IN_2_34
+void    g_test_add_data_func_full       (const char     *testpath,
+                                         gpointer        test_data,
+                                         GTestDataFunc   test_func,
+                                         GDestroyNotify  data_free_func);
+
+/* tell about failure */
+void    g_test_fail                     (void);
+
 /* hook up a test with fixture under test path */
 #define g_test_add(testpath, Fixture, tdata, fsetup, ftest, fteardown) \
 					G_STMT_START {			\
@@ -232,6 +243,7 @@ typedef struct {
   gboolean      test_perf;      /* run performance tests */
   gboolean      test_verbose;   /* extra info */
   gboolean      test_quiet;     /* reduce output */
+  gboolean      test_undefined; /* run tests that are meant to assert */
 } GTestConfig;
 GLIB_VAR const GTestConfig * const g_test_config_vars;
 
@@ -292,6 +304,16 @@ void
 g_test_log_set_fatal_handler            (GTestLogFatalFunc log_func,
                                          gpointer          user_data);
 
+void    g_test_expect_message                    (const gchar    *log_domain,
+                                                  GLogLevelFlags  log_level,
+                                                  const gchar    *pattern);
+void    g_test_assert_expected_messages_internal (const char     *domain,
+                                                  const char     *file,
+                                                  int             line,
+                                                  const char     *func);
+
+#define g_test_assert_expected_messages() g_test_assert_expected_messages_internal (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC)
+
 G_END_DECLS
 
 #endif /* __G_TEST_UTILS_H__ */