include <stdlib.h> and <stddef.h> if STDC_HEADERS is defined.
[platform/upstream/glib.git] / glib.h
diff --git a/glib.h b/glib.h
index b94c945..7f31ba9 100644 (file)
--- a/glib.h
+++ b/glib.h
 #ifndef __G_LIB_H__
 #define __G_LIB_H__
 
+/* Here we provide G_GNUC_EXTENSION as an alias for __extension__,
+ * where this is valid. This allows for warningless compilation of
+ * "long long" types even in the presence of '-ansi -pedantic'. This
+ * of course should be with the other GCC-isms below, but then
+ * glibconfig.h wouldn't load cleanly and it is better to have that
+ * here, than in glibconfig.h.  
+ */
+#if    __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
+#  define G_GNUC_EXTENSION __extension__
+#else
+#  define G_GNUC_EXTENSION
+#endif
+
 /* system specific config file glibconfig.h provides definitions for
  * the extrema of many of the standard types. These are:
  *
@@ -42,6 +55,7 @@
  *  gint16, guint16
  *  gint32, guint32
  *  gint64, guint64
+ *  gssize, gsize
  *
  * It defines the G_BYTE_ORDER symbol to one of G_*_ENDIAN (see later in
  * this file). 
  */
 #include <glibconfig.h>
 
+/* Define some mathematical constants that aren't available
+ * symbolically in some strict ISO C implementations.
+ */
+#define G_E     2.7182818284590452354E0
+#define G_LN2   6.9314718055994530942E-1
+#define G_LN10  2.3025850929940456840E0
+#define G_PI    3.14159265358979323846E0
+#define G_PI_2  1.57079632679489661923E0
+#define G_PI_4  0.78539816339744830962E0
+#define G_SQRT2 1.4142135623730950488E0
+
 /* include varargs functions for assertment macros
  */
 #include <stdarg.h>
@@ -134,6 +159,19 @@ extern "C" {
 #define G_STRINGIFY(macro_or_string)   G_STRINGIFY_ARG (macro_or_string)
 #define        G_STRINGIFY_ARG(contents)       #contents
 
+/* provide a string identifying the current code position */
+#ifdef  __GNUC__
+#  define G_STRLOC     __FILE__ ":" G_STRINGIFY (__LINE__) ":" __PRETTY_FUNCTION__ "()"
+#else
+#  define G_STRLOC     __FILE__ ":" G_STRINGIFY (__LINE__)
+#endif
+
+
+/* Count the number of elements in an array. The array must be defined
+ * as such; using this with a dynamically allocated array will give
+ * incorrect results.
+ */
+#define G_N_ELEMENTS(arr)              (sizeof (arr) / sizeof ((arr)[0]))
 
 /* Define G_VA_COPY() to do the right thing for copying va_list variables.
  * glibconfig.h may have already defined G_VA_COPY as va_copy or __va_copy.
@@ -153,9 +191,9 @@ extern "C" {
  * fields through their offsets.
  */
 #define G_STRUCT_OFFSET(struct_type, member)   \
-    ((gulong) ((gchar*) &((struct_type*) 0)->member))
+    ((glong) ((guint8*) &((struct_type*) 0)->member))
 #define G_STRUCT_MEMBER_P(struct_p, struct_offset)   \
-    ((gpointer) ((gchar*) (struct_p) + (gulong) (struct_offset)))
+    ((gpointer) ((guint8*) (struct_p) + (glong) (struct_offset)))
 #define G_STRUCT_MEMBER(member_type, struct_p, struct_offset)   \
     (*(member_type*) G_STRUCT_MEMBER_P ((struct_p), (struct_offset)))
 
@@ -260,7 +298,6 @@ extern "C" {
 #define        G_GNUC_UNUSED
 #endif /* !__GNUC__ */
 
-
 /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
  * macros, so we can refer to them as strings unconditionally.
  */
@@ -390,6 +427,8 @@ extern "C" {
 
 #define g_return_if_fail(expr)
 #define g_return_val_if_fail(expr,val)
+#define g_return_if_reached() return
+#define g_return_val_if_reached(val) return (val)
 
 #else /* !G_DISABLE_CHECKS */
 
@@ -400,7 +439,7 @@ extern "C" {
        {                                                               \
         g_log (G_LOG_DOMAIN,                                           \
                G_LOG_LEVEL_CRITICAL,                                   \
-               "file %s: line %d (%s): assertion `%s' failed.",        \
+               "file %s: line %d (%s): assertion `%s' failed",         \
                __FILE__,                                               \
                __LINE__,                                               \
                __PRETTY_FUNCTION__,                                    \
@@ -413,14 +452,32 @@ extern "C" {
        {                                                               \
         g_log (G_LOG_DOMAIN,                                           \
                G_LOG_LEVEL_CRITICAL,                                   \
-               "file %s: line %d (%s): assertion `%s' failed.",        \
+               "file %s: line %d (%s): assertion `%s' failed",         \
                __FILE__,                                               \
                __LINE__,                                               \
                __PRETTY_FUNCTION__,                                    \
                #expr);                                                 \
-        return val;                                                    \
+        return (val);                                                  \
        };                              }G_STMT_END
 
+#define g_return_if_reached()          G_STMT_START{                   \
+     g_log (G_LOG_DOMAIN,                                              \
+           G_LOG_LEVEL_CRITICAL,                                       \
+           "file %s: line %d (%s): should not be reached",             \
+           __FILE__,                                                   \
+           __LINE__,                                                   \
+           __PRETTY_FUNCTION__);                                       \
+     return;                           }G_STMT_END
+
+#define g_return_val_if_reached(val)   G_STMT_START{                   \
+     g_log (G_LOG_DOMAIN,                                              \
+           G_LOG_LEVEL_CRITICAL,                                       \
+           "file %s: line %d (%s): should not be reached",             \
+           __FILE__,                                                   \
+           __LINE__,                                                   \
+           __PRETTY_FUNCTION__);                                       \
+     return (val);                     }G_STMT_END
+
 #else /* !__GNUC__ */
 
 #define g_return_if_fail(expr)         G_STMT_START{           \
@@ -428,7 +485,7 @@ extern "C" {
        {                                                       \
         g_log (G_LOG_DOMAIN,                                   \
                G_LOG_LEVEL_CRITICAL,                           \
-               "file %s: line %d: assertion `%s' failed.",     \
+               "file %s: line %d: assertion `%s' failed",      \
                __FILE__,                                       \
                __LINE__,                                       \
                #expr);                                         \
@@ -440,13 +497,29 @@ extern "C" {
        {                                                       \
         g_log (G_LOG_DOMAIN,                                   \
                G_LOG_LEVEL_CRITICAL,                           \
-               "file %s: line %d: assertion `%s' failed.",     \
+               "file %s: line %d: assertion `%s' failed",      \
                __FILE__,                                       \
                __LINE__,                                       \
                #expr);                                         \
-        return val;                                            \
+        return (val);                                          \
        };                              }G_STMT_END
 
+#define g_return_if_reached()          G_STMT_START{           \
+     g_log (G_LOG_DOMAIN,                                      \
+           G_LOG_LEVEL_CRITICAL,                               \
+           "file %s: line %d: should not be reached",          \
+           __FILE__,                                           \
+           __LINE__);                                          \
+     return;                           }G_STMT_END
+
+#define g_return_val_if_reached(val)   G_STMT_START{           \
+     g_log (G_LOG_DOMAIN,                                      \
+           G_LOG_LEVEL_CRITICAL,                               \
+           "file %s: line %d: should not be reached",          \
+           __FILE__,                                           \
+           __LINE__);                                          \
+     return (val);                     }G_STMT_END
+
 #endif /* !__GNUC__ */
 
 #endif /* !G_DISABLE_CHECKS */
@@ -464,6 +537,7 @@ typedef short  gshort;
 typedef long   glong;
 typedef int    gint;
 typedef gint   gboolean;
+typedef gchar* gstring;
 
 typedef unsigned char  guchar;
 typedef unsigned short gushort;
@@ -495,8 +569,6 @@ typedef void* gpointer;
 typedef const void *gconstpointer;
 
 
-typedef gint32 gssize;
-typedef guint32 gsize;
 typedef guint32 GQuark;
 typedef gint32 GTime;
 
@@ -661,19 +733,19 @@ typedef gint32    GTime;
  */
 #ifdef G_OS_WIN32
 #  ifdef GLIB_COMPILATION
-#    define GUTILS_C_VAR __declspec(dllexport)
+#    define GLIB_VAR __declspec(dllexport)
 #  else /* !GLIB_COMPILATION */
-#    define GUTILS_C_VAR extern __declspec(dllimport)
+#    define GLIB_VAR extern __declspec(dllimport)
 #  endif /* !GLIB_COMPILATION */
 #else /* !G_OS_WIN32 */
-#  define GUTILS_C_VAR extern
+#  define GLIB_VAR extern
 #endif /* !G_OS_WIN32 */
 
-GUTILS_C_VAR const guint glib_major_version;
-GUTILS_C_VAR const guint glib_minor_version;
-GUTILS_C_VAR const guint glib_micro_version;
-GUTILS_C_VAR const guint glib_interface_age;
-GUTILS_C_VAR const guint glib_binary_age;
+GLIB_VAR const guint glib_major_version;
+GLIB_VAR const guint glib_minor_version;
+GLIB_VAR const guint glib_micro_version;
+GLIB_VAR const guint glib_interface_age;
+GLIB_VAR const guint glib_binary_age;
 
 #define GLIB_CHECK_VERSION(major,minor,micro)    \
     (GLIB_MAJOR_VERSION > (major) || \
@@ -800,8 +872,6 @@ typedef gboolean    (*GNodeTraverseFunc)    (GNode         *node,
                                                 gpointer       data);
 typedef void           (*GNodeForeachFunc)     (GNode         *node,
                                                 gpointer       data);
-typedef gint           (*GSearchFunc)          (gpointer       key,
-                                                gpointer       data);
 typedef void           (*GScannerMsgFunc)      (GScanner      *scanner,
                                                 gchar         *message,
                                                 gint           error);
@@ -958,7 +1028,7 @@ GList* g_list_insert_sorted        (GList          *list,
 GList* g_list_concat           (GList          *list1,
                                 GList          *list2);
 GList* g_list_remove           (GList          *list,
-                                gpointer        data);
+                                gconstpointer   data);
 GList* g_list_remove_link      (GList          *list,
                                 GList          *llink);
 GList* g_list_delete_link      (GList          *list,
@@ -968,14 +1038,14 @@ GList* g_list_copy               (GList          *list);
 GList* g_list_nth              (GList          *list,
                                 guint           n);
 GList* g_list_find             (GList          *list,
-                                gpointer        data);
+                                gconstpointer   data);
 GList* g_list_find_custom      (GList          *list,
-                                gpointer        data,
+                                gconstpointer   data,
                                 GCompareFunc    func);
 gint   g_list_position         (GList          *list,
                                 GList          *llink);
 gint   g_list_index            (GList          *list,
-                                gpointer        data);
+                                gconstpointer   data);
 GList* g_list_last             (GList          *list);
 GList* g_list_first            (GList          *list);
 guint  g_list_length           (GList          *list);
@@ -1007,10 +1077,13 @@ GSList* g_slist_insert          (GSList         *list,
 GSList* g_slist_insert_sorted  (GSList         *list,
                                 gpointer        data,
                                 GCompareFunc    func);
+GSList* g_slist_insert_before   (GSList         *slist,
+                                GSList         *sibling,
+                                gpointer        data);
 GSList* g_slist_concat         (GSList         *list1,
                                 GSList         *list2);
 GSList* g_slist_remove         (GSList         *list,
-                                gpointer        data);
+                                gconstpointer   data);
 GSList* g_slist_remove_link    (GSList         *list,
                                 GSList         *link);
 GSList* g_slist_delete_link     (GSList         *list,
@@ -1020,14 +1093,14 @@ GSList* g_slist_copy            (GSList         *list);
 GSList* g_slist_nth            (GSList         *list,
                                 guint           n);
 GSList* g_slist_find           (GSList         *list,
-                                gpointer        data);
+                                gconstpointer   data);
 GSList* g_slist_find_custom    (GSList         *list,
-                                gpointer        data,
+                                gconstpointer   data,
                                 GCompareFunc    func);
 gint   g_slist_position        (GSList         *list,
                                 GSList         *llink);
 gint   g_slist_index           (GSList         *list,
-                                gpointer        data);
+                                gconstpointer   data);
 GSList* g_slist_last           (GSList         *list);
 guint  g_slist_length          (GSList         *list);
 void   g_slist_foreach         (GSList         *list,
@@ -1042,7 +1115,7 @@ gpointer g_slist_nth_data (GSList         *list,
 
 /* Queues
  */
-GQueue*  g_queue_create         (void);
+GQueue*  g_queue_new            (void);
 void     g_queue_free           (GQueue  *queue);
 void     g_queue_push_head      (GQueue  *queue,
                                 gpointer data);
@@ -1060,7 +1133,6 @@ void     g_queue_push_tail_link (GQueue  *queue,
 GList*   g_queue_pop_head_link  (GQueue  *queue);
 GList*   g_queue_pop_tail_link  (GQueue  *queue);
 
-
 /* Hash tables
  */
 GHashTable* g_hash_table_new           (GHashFunc       hash_func,
@@ -1077,8 +1149,6 @@ gboolean    g_hash_table_lookup_extended(GHashTable       *hash_table,
                                         gconstpointer   lookup_key,
                                         gpointer       *orig_key,
                                         gpointer       *value);
-void       g_hash_table_freeze         (GHashTable     *hash_table);
-void       g_hash_table_thaw           (GHashTable     *hash_table);
 void       g_hash_table_foreach        (GHashTable     *hash_table,
                                         GHFunc          func,
                                         gpointer        user_data);
@@ -1087,6 +1157,10 @@ guint        g_hash_table_foreach_remove (GHashTable     *hash_table,
                                         gpointer        user_data);
 guint      g_hash_table_size           (GHashTable     *hash_table);
 
+/* The following two functions are deprecated and will be removed in
+ * the next major release. They do no good. */
+void       g_hash_table_freeze         (GHashTable     *hash_table);
+void       g_hash_table_thaw           (GHashTable     *hash_table);
 
 /* Caches
  */
@@ -1101,7 +1175,7 @@ void       g_cache_destroy       (GCache            *cache);
 gpointer g_cache_insert               (GCache            *cache,
                                gpointer           key);
 void    g_cache_remove        (GCache            *cache,
-                               gpointer           value);
+                               gconstpointer      value);
 void    g_cache_key_foreach   (GCache            *cache,
                                GHFunc             func,
                                gpointer           user_data);
@@ -1118,16 +1192,16 @@ void     g_tree_insert   (GTree         *tree,
                          gpointer       key,
                          gpointer       value);
 void    g_tree_remove   (GTree         *tree,
-                         gpointer       key);
+                         gconstpointer  key);
 gpointer g_tree_lookup  (GTree         *tree,
-                         gpointer       key);
+                         gconstpointer  key);
 void    g_tree_traverse (GTree         *tree,
                          GTraverseFunc  traverse_func,
                          GTraverseType  traverse_type,
                          gpointer       data);
 gpointer g_tree_search  (GTree         *tree,
-                         GSearchFunc    search_func,
-                         gpointer       data);
+                         GCompareFunc   search_func,
+                         gconstpointer  data);
 gint    g_tree_height   (GTree         *tree);
 gint    g_tree_nnodes   (GTree         *tree);
 
@@ -1154,6 +1228,7 @@ void     g_node_pop_allocator   (void);
 GNode*  g_node_new             (gpointer          data);
 void    g_node_destroy         (GNode            *root);
 void    g_node_unlink          (GNode            *node);
+GNode*   g_node_copy            (GNode            *node);
 GNode*  g_node_insert          (GNode            *parent,
                                 gint              position,
                                 GNode            *node);
@@ -1402,6 +1477,9 @@ GLogLevelFlags    g_log_set_always_fatal  (GLogLevelFlags  fatal_mask);
 #define        g_message(format, args...)      g_log (G_LOG_DOMAIN, \
                                               G_LOG_LEVEL_MESSAGE, \
                                               format, ##args)
+#define        g_critical(format, args...)     g_log (G_LOG_DOMAIN, \
+                                              G_LOG_LEVEL_CRITICAL, \
+                                              format, ##args)
 #define        g_warning(format, args...)      g_log (G_LOG_DOMAIN, \
                                               G_LOG_LEVEL_WARNING, \
                                               format, ##args)
@@ -1425,6 +1503,15 @@ g_message (const gchar *format,
   va_end (args);
 }
 static void
+g_critical (const gchar *format,
+           ...)
+{
+  va_list args;
+  va_start (args, format);
+  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, format, args);
+  va_end (args);
+}
+static void
 g_warning (const gchar *format,
           ...)
 {
@@ -1552,6 +1639,9 @@ void    g_usleep        (gulong microseconds);
 gchar*  g_strdelimit           (gchar       *string,
                                 const gchar *delimiters,
                                 gchar        new_delimiter);
+gchar*  g_strcanon             (gchar       *string,
+                                const gchar *valid_chars,
+                                gchar        subsitutor);
 gdouble         g_strtod               (const gchar *nptr,
                                 gchar      **endptr);
 gchar*  g_strerror             (gint         errnum);
@@ -1561,9 +1651,9 @@ gint       g_strcasecmp           (const gchar *s1,
 gint    g_strncasecmp          (const gchar *s1,
                                 const gchar *s2,
                                 guint        n);
-void    g_strdown              (gchar       *string);
-void    g_strup                (gchar       *string);
-void    g_strreverse           (gchar       *string);
+gchar*  g_strdown              (gchar       *string);
+gchar*  g_strup                (gchar       *string);
+gchar*  g_strreverse           (gchar       *string);
 /* removes leading spaces */
 gchar*   g_strchug              (gchar        *string);
 /* removes trailing spaces */
@@ -1593,17 +1683,22 @@ gchar*   g_strjoin              (const gchar  *separator,
  */
 gchar*   g_strcompress         (const gchar *source);
 
+/* Convert between the operating system (or C runtime)
+ * representation of file names and UTF-8.
+ */
+gchar*   g_filename_to_utf8 (const gchar *opsysstring);
+gchar*   g_filename_from_utf8 (const gchar *utf8string);
+
 /* Copy a string escaping nonprintable characters like in C strings.
  * Inverse of g_strcompress. The exceptions parameter, if non-NULL, points
  * to a string containing characters that are not to be escaped.
+ *
+ * Deprecated API: gchar* g_strescape (const gchar *source);
+ * Luckily this function wasn't used much, using NULL as second parameter
+ * provides mostly identical semantics.
  */
 gchar*   g_strescape           (const gchar *source,
                                 const gchar *exceptions);
-/* Deprecated API:
- * gchar* g_strescape (const gchar *source);
- * Luckily this function wasn't much used.
- * Add a second NULL parameter in calls for mostly identical semantics.
- */
 
 gpointer g_memdup              (gconstpointer mem,
                                 guint         byte_size);
@@ -1653,17 +1748,29 @@ gint    g_vsnprintf             (gchar       *string,
                                 gulong       n,
                                 gchar const *format,
                                 va_list      args);
-gchar* g_basename              (const gchar *file_name);
 /* Check if a file name is an absolute path */
 gboolean g_path_is_absolute    (const gchar *file_name);
 /* In case of absolute paths, skip the root part */
 gchar*  g_path_skip_root       (gchar       *file_name);
 
-/* strings are newly allocated with g_malloc() */
+/* These two functions are deprecated and will be removed in the next
+ * major release of GLib. Use g_path_get_dirname/g_path_get_basename
+ * instead. Whatch out! The string returned by g_path_get_basename
+ * must be g_freed, while the string returned by g_basename must not.*/
+gchar* g_basename              (const gchar *file_name);
 gchar* g_dirname               (const gchar *file_name);
+
+/* The returned strings are newly allocated with g_malloc() */
 gchar* g_get_current_dir       (void);
-gchar*  g_getenv               (const gchar *variable);
+gchar* g_path_get_basename     (const gchar *file_name);
+gchar* g_path_get_dirname      (const gchar *file_name);
 
+/* Get the codeset for the current locale */
+/* gchar * g_get_codeset    (void); */
+
+/* return the environment string for the variable. The returned memory
+ * must not be freed. */
+gchar*  g_getenv               (const gchar *variable);
 
 /* we use a GLib function as a replacement for ATEXIT, so
  * the programmer is not required to check the return value
@@ -1813,19 +1920,32 @@ gchar*        g_string_chunk_insert_const  (GStringChunk *chunk,
 GString*     g_string_new              (const gchar     *init);
 GString*     g_string_sized_new         (guint           dfl_size);
 void        g_string_free              (GString         *string,
-                                        gint             free_segment);
-GString*     g_string_assign            (GString        *lval,
+                                        gboolean         free_segment);
+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,
-                                        gint             len);
+                                        guint            len);
+GString*     g_string_insert_len        (GString         *string,
+                                         gint             pos,
+                                         const gchar     *val,
+                                         gint             len);
 GString*     g_string_append            (GString        *string,
                                         const gchar     *val);
+GString*     g_string_append_len        (GString        *string,
+                                        const gchar     *val,
+                                         gint             len);
 GString*     g_string_append_c          (GString        *string,
                                         gchar            c);
 GString*     g_string_prepend           (GString        *string,
                                         const gchar     *val);
 GString*     g_string_prepend_c         (GString        *string,
                                         gchar            c);
+GString*     g_string_prepend_len       (GString        *string,
+                                        const gchar     *val,
+                                         gint             len);
 GString*     g_string_insert            (GString        *string,
                                         gint             pos,
                                         const gchar     *val);
@@ -1858,6 +1978,10 @@ void         g_string_sprintfa          (GString  *string,
 GArray* g_array_new              (gboolean         zero_terminated,
                                   gboolean         clear,
                                   guint            element_size);
+GArray* g_array_sized_new         (gboolean        zero_terminated,
+                                  gboolean         clear,
+                                  guint            element_size,
+                                  guint            reserved_size);
 void   g_array_free              (GArray          *array,
                                   gboolean         free_segment);
 GArray* g_array_append_vals       (GArray         *array,
@@ -1884,6 +2008,7 @@ GArray* g_array_remove_index_fast (GArray    *array,
  */
 #define            g_ptr_array_index(array,index) (array->pdata)[index]
 GPtrArray*  g_ptr_array_new               (void);
+GPtrArray*  g_ptr_array_sized_new         (guint        reserved_size);
 void       g_ptr_array_free               (GPtrArray   *array,
                                            gboolean     free_seg);
 void       g_ptr_array_set_size           (GPtrArray   *array,
@@ -1904,6 +2029,7 @@ void          g_ptr_array_add                (GPtrArray   *array,
  */
 
 GByteArray* g_byte_array_new              (void);
+GByteArray* g_byte_array_sized_new        (guint        reserved_size);
 void       g_byte_array_free              (GByteArray   *array,
                                            gboolean      free_segment);
 GByteArray* g_byte_array_append                   (GByteArray   *array,
@@ -1922,13 +2048,13 @@ GByteArray* g_byte_array_remove_index_fast (GByteArray   *array,
 
 /* Hash Functions
  */
-gint  g_str_equal (gconstpointer   v,
-                  gconstpointer   v2);
-guint g_str_hash  (gconstpointer   v);
+gboolean g_str_equal (gconstpointer   v,
+                     gconstpointer   v2);
+guint   g_str_hash  (gconstpointer   v);
 
-gint  g_int_equal (gconstpointer   v,
-                  gconstpointer   v2);
-guint g_int_hash  (gconstpointer   v);
+gint    g_int_equal (gconstpointer   v,
+                     gconstpointer   v2);
+guint   g_int_hash  (gconstpointer   v);
 
 /* This "hash" function will just return the key's adress as an
  * unsigned integer. Useful for hashing on plain adresses or
@@ -1959,7 +2085,7 @@ void        g_datalist_id_set_data_full    (GData          **datalist,
                                          GQuark           key_id,
                                          gpointer         data,
                                          GDestroyNotify   destroy_func);
-void     g_datalist_id_remove_no_notify (GData          **datalist,
+gpointer  g_datalist_id_remove_no_notify (GData                 **datalist,
                                          GQuark           key_id);
 void     g_datalist_foreach             (GData          **datalist,
                                          GDataForeachFunc func,
@@ -1989,7 +2115,7 @@ void        g_dataset_id_set_data_full    (gconstpointer    dataset_location,
                                         GQuark           key_id,
                                         gpointer         data,
                                         GDestroyNotify   destroy_func);
-void     g_dataset_id_remove_no_notify (gconstpointer    dataset_location,
+gpointer  g_dataset_id_remove_no_notify        (gconstpointer    dataset_location,
                                         GQuark           key_id);
 void     g_dataset_foreach             (gconstpointer    dataset_location,
                                         GDataForeachFunc func,
@@ -2016,6 +2142,7 @@ void        g_dataset_foreach             (gconstpointer    dataset_location,
 /* Character sets */
 #define G_CSET_A_2_Z   "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 #define G_CSET_a_2_z   "abcdefghijklmnopqrstuvwxyz"
+#define G_CSET_DIGITS  "0123456789"
 #define G_CSET_LATINC  "\300\301\302\303\304\305\306"\
                        "\307\310\311\312\313\314\315\316\317\320"\
                        "\321\322\323\324\325\326"\
@@ -2201,8 +2328,6 @@ void              g_scanner_scope_foreach_symbol  (GScanner       *scanner,
                                                 gpointer        user_data);
 gpointer       g_scanner_lookup_symbol         (GScanner       *scanner,
                                                 const gchar    *symbol);
-void           g_scanner_freeze_symbol_table   (GScanner       *scanner);
-void           g_scanner_thaw_symbol_table     (GScanner       *scanner);
 void           g_scanner_unexp_token           (GScanner       *scanner,
                                                 GTokenType     expected_token,
                                                 const gchar    *identifier_spec,
@@ -2228,6 +2353,10 @@ gint             g_scanner_stat_mode             (const gchar    *filename);
   g_scanner_scope_foreach_symbol ((scanner), 0, (func), (data)); \
 } G_STMT_END
 
+/* The following two functions are deprecated and will be removed in
+ * the next major release. They do no good. */
+void           g_scanner_freeze_symbol_table   (GScanner       *scanner);
+void           g_scanner_thaw_symbol_table     (GScanner       *scanner);
 
 /* GCompletion
  */
@@ -2644,7 +2773,7 @@ struct _GSourceFuncs
                        GTimeVal *current_time,
                        gpointer  user_data);
   gboolean (*dispatch) (gpointer  source_data, 
-                       GTimeVal *current_time,
+                       GTimeVal *dispatch_time,
                        gpointer  user_data);
   GDestroyNotify destroy;
 };
@@ -2672,7 +2801,7 @@ gboolean g_source_remove_by_source_data      (gpointer       source_data);
 gboolean g_source_remove_by_funcs_user_data  (GSourceFuncs  *funcs,
                                              gpointer       user_data);
 
-void g_get_current_time                    (GTimeVal      *result);
+void g_get_current_time                        (GTimeVal       *result);
 
 /* Running the main loop */
 GMainLoop*     g_main_new              (gboolean        is_running);
@@ -2762,7 +2891,7 @@ gint        g_io_channel_unix_get_fd (GIOChannel *channel);
 
 #ifdef G_OS_WIN32
 
-GUTILS_C_VAR guint g_pipe_readable_msg;
+GLIB_VAR guint g_pipe_readable_msg;
 
 #define G_WIN32_MSG_HANDLE 19981206
 
@@ -2884,6 +3013,12 @@ gint             g_win32_closedir        (DIR            *dir);
  */
 gchar *                g_win32_getlocale  (void);
 
+/* Translate a Win32 error code (as returned by GetLastError()) into
+ * the corresponding message. The returned string should be deallocated
+ * with g_free().
+ */
+gchar *         g_win32_error_message (gint error);
+
 #endif  /* G_OS_WIN32 */
 
 
@@ -2912,6 +3047,8 @@ typedef struct _GMutex            GMutex;
 typedef struct _GCond          GCond;
 typedef struct _GPrivate       GPrivate;
 typedef struct _GStaticPrivate GStaticPrivate;
+typedef struct _GAsyncQueue    GAsyncQueue;
+typedef struct _GThreadPool     GThreadPool;
 
 typedef struct _GThreadFunctions GThreadFunctions;
 struct _GThreadFunctions
@@ -2949,9 +3086,9 @@ struct _GThreadFunctions
   void      (*thread_self)        (gpointer              thread);
 };
 
-GUTILS_C_VAR GThreadFunctions  g_thread_functions_for_glib_use;
-GUTILS_C_VAR gboolean          g_thread_use_default_impl;
-GUTILS_C_VAR gboolean          g_threads_got_initialized;
+GLIB_VAR GThreadFunctions      g_thread_functions_for_glib_use;
+GLIB_VAR gboolean              g_thread_use_default_impl;
+GLIB_VAR gboolean              g_threads_got_initialized;
 
 /* initializes the mutex/cond/private implementation for glib, might
  * only be called once, and must not be called directly or indirectly
@@ -3035,24 +3172,22 @@ void g_static_private_set_for_thread (GStaticPrivate *private_key,
                                      GThread        *thread,
                                      gpointer        data,
                                      GDestroyNotify  notify);
-#ifndef G_STATIC_REC_MUTEX_INIT
-/* if GStaticRecMutex is not just a differently initialized GStaticMutex, 
- * the following is done:
- * This can't be done in glibconfig.h, as GStaticPrivate and gboolean
- * are not yet known there 
- */
+
 typedef struct _GStaticRecMutex GStaticRecMutex;
 struct _GStaticRecMutex
 {
   GStaticMutex mutex;
-  GStaticPrivate counter; 
+  unsigned int depth;
+  GSystemThread owner;
 };
-#define G_STATIC_REC_MUTEX_INIT { G_STATIC_MUTEX_INIT, G_STATIC_PRIVATE_INIT }
-void     g_static_rec_mutex_lock    (GStaticRecMutex* mutex);
-gboolean g_static_rec_mutex_trylock (GStaticRecMutex* mutex);
-void     g_static_rec_mutex_unlock  (GStaticRecMutex* mutex);
-#define  g_static_rec_mutex_get_mutex(mutex) ((mutex)->mutex)
-#endif /* G_STATIC_REC_MUTEX_INIT */
+
+#define G_STATIC_REC_MUTEX_INIT { G_STATIC_MUTEX_INIT }
+void     g_static_rec_mutex_lock        (GStaticRecMutex *mutex);
+gboolean g_static_rec_mutex_trylock     (GStaticRecMutex *mutex);
+void     g_static_rec_mutex_unlock      (GStaticRecMutex *mutex);
+void     g_static_rec_mutex_lock_full   (GStaticRecMutex *mutex,
+                                        guint            depth);
+guint    g_static_rec_mutex_unlock_full (GStaticRecMutex *mutex);
 
 typedef struct _GStaticRWLock GStaticRWLock;
 struct _GStaticRWLock
@@ -3085,7 +3220,7 @@ void      g_static_rw_lock_free (GStaticRWLock* lock);
  * G_TRYLOCK() respectively.  
  */
 extern void glib_dummy_decl (void);
-#define G_LOCK_NAME(name)              (g__ ## name ## _lock)
+#define G_LOCK_NAME(name)              g__ ## name ## _lock
 #ifdef G_THREADS_ENABLED
 #  define G_LOCK_DEFINE_STATIC(name)   static G_LOCK_DEFINE (name)
 #  define G_LOCK_DEFINE(name)          \
@@ -3107,12 +3242,11 @@ extern void glib_dummy_decl (void);
                #name);                                            \
        g_static_mutex_unlock (&G_LOCK_NAME (name));               \
      }G_STMT_END
-#    define G_TRYLOCK(name)            G_STMT_START{             \
-        g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,                          \
+#    define G_TRYLOCK(name)                                      \
+        (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,                 \
               "file %s: line %d (%s): try locking: %s ",         \
               __FILE__,        __LINE__, G_GNUC_PRETTY_FUNCTION, \
-               #name);                                            \
-     }G_STMT_END,      g_static_mutex_trylock (&G_LOCK_NAME (name))
+               #name), g_static_mutex_trylock (&G_LOCK_NAME (name)))
 #  else         /* !G_DEBUG_LOCKS */
 #    define G_LOCK(name) g_static_mutex_lock      (&G_LOCK_NAME (name)) 
 #    define G_UNLOCK(name) g_static_mutex_unlock   (&G_LOCK_NAME (name))
@@ -3127,9 +3261,133 @@ extern void glib_dummy_decl (void);
 #  define G_TRYLOCK(name)              (TRUE)
 #endif /* !G_THREADS_ENABLED */
 
+/* Asyncronous Queues, can be used to communicate between threads
+ */
+
+/* Get a new GAsyncQueue with the ref_count 1 */
+GAsyncQueue*  g_async_queue_new                (void);
+
+/* Lock and unlock an GAsyncQueue, all functions lock the queue for
+ * themselves, but in certain cirumstances you want to hold the lock longer,
+ * thus you lock the queue, call the *_unlocked functions and unlock it again
+ */
+void          g_async_queue_lock               (GAsyncQueue *queue);
+void          g_async_queue_unlock             (GAsyncQueue *queue);
+
+/* Ref and unref the GAsyncQueue. g_async_queue_unref_unlocked makes
+ * no sense, as after the unreffing the Queue might be gone and can't
+ * be unlocked. So you have a function to call, if you don't hold the
+ * lock (g_async_queue_unref) and one to call, when you already hold
+ * the lock (g_async_queue_unref_and_unlock). After that however, you
+ * don't hold the lock anymore and the Queue might in fact be
+ * destroyed, if you unrefed to zero */
+void          g_async_queue_ref                (GAsyncQueue *queue);
+void          g_async_queue_ref_unlocked       (GAsyncQueue *queue);
+void          g_async_queue_unref              (GAsyncQueue *queue);
+void          g_async_queue_unref_and_unlock   (GAsyncQueue *queue);
+
+/* Push data into the async queue. Must not be NULL */
+void          g_async_queue_push               (GAsyncQueue *queue,
+                                               gpointer     data);
+void          g_async_queue_push_unlocked      (GAsyncQueue *queue,
+                                               gpointer     data);
+
+/* Pop data from the async queue, when no data is there, the thread is blocked
+ * until data arrives */
+gpointer      g_async_queue_pop                (GAsyncQueue *queue);
+gpointer      g_async_queue_pop_unlocked       (GAsyncQueue *queue);
+
+/* Try to pop data, NULL is returned in case of empty queue */
+gpointer      g_async_queue_try_pop            (GAsyncQueue *queue);
+gpointer      g_async_queue_try_pop_unlocked   (GAsyncQueue *queue);
+
+/* Wait for data until at maximum until end_time is reached, NULL is returned
+ * in case of empty queue*/
+gpointer      g_async_queue_timed_pop          (GAsyncQueue *queue, 
+                                               GTimeVal    *end_time);
+gpointer      g_async_queue_timed_pop_unlocked (GAsyncQueue *queue, 
+                                               GTimeVal    *end_time);
+
+/* Return the length of the queue, negative values mean, that threads
+ * are waiting, positve values mean, that there are entries in the
+ * queue. Actually this function returns the length of the queue minus
+ * the number of waiting threads, g_async_queue_length == 0 could also
+ * mean 'n' entries in the queue and 'n' thread waiting, such can
+ * happen due to locking of the queue or due to scheduling. */
+gint          g_async_queue_length             (GAsyncQueue *queue);
+gint          g_async_queue_length_unlocked    (GAsyncQueue *queue);
+
+/* Thread Pools
+ */
+
+/* The real GThreadPool is bigger, so you may only create a thread
+ * pool with the constructor function */
+struct _GThreadPool
+{
+  GFunc thread_func;
+  gulong stack_size;
+  gboolean bound; 
+  GThreadPriority priority;
+  gboolean exclusive;
+  gpointer user_data;
+};
+
+/* Get a thread pool with the function thread_func, at most max_threads may
+ * run at a time (max_threads == -1 means no limit), stack_size, bound,
+ * priority like in g_thread_create, exclusive == TRUE means, that the threads
+ * shouldn't be shared and that they will be prestarted (otherwise they are
+ * started, as needed) user_data is the 2nd argument to the thread_func */
+GThreadPool*    g_thread_pool_new             (GFunc            thread_func,
+                                              gint             max_threads,
+                                              gulong           stack_size,
+                                              gboolean         bound,
+                                              GThreadPriority  priority,
+                                              gboolean         exclusive,
+                                              gpointer         user_data);
+
+/* Push new data into the thread pool. This task is assigned to a thread later
+ * (when the maximal number of threads is reached for that pool) or now
+ * (otherwise). If necessary a new thread will be started. The function
+ * returns immediatly */
+void            g_thread_pool_push            (GThreadPool     *pool,
+                                              gpointer         data);
+
+/* Set the number of threads, which can run concurrently for that pool, -1
+ * means no limit. 0 means has the effect, that the pool won't process
+ * requests until the limit is set higher again */
+void            g_thread_pool_set_max_threads (GThreadPool     *pool,
+                                              gint             max_threads);
+gint            g_thread_pool_get_max_threads (GThreadPool     *pool);
+
+/* Get the number of threads assigned to that pool. This number doesn't
+ * necessarily represent the number of working threads in that pool */
+guint           g_thread_pool_get_num_threads (GThreadPool     *pool);
+
+/* Get the number of unprocessed items in the pool */
+guint           g_thread_pool_unprocessed     (GThreadPool     *pool);
+
+/* Free the pool, immediate means, that all unprocessed items in the queue
+ * wont be processed, wait means, that the function doesn't return immediatly,
+ * but after all threads in the pool are ready processing items. immediate
+ * does however not mean, that threads are killed. */
+void            g_thread_pool_free            (GThreadPool     *pool,
+                                               gboolean         immediate,
+                                              gboolean         wait);
+
+/* Set the maximal number of unused threads before threads will be stopped by
+ * GLib, -1 means no limit */
+void            g_thread_pool_set_max_unused_threads (gint      max_threads);
+gint            g_thread_pool_get_max_unused_threads (void);
+guint           g_thread_pool_get_num_unused_threads (void);
+
+/* Stop all currently unused threads, but leave the limit untouched */
+void            g_thread_pool_stop_unused_threads    (void);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
+#include <gunicode.h>
+#include <gerror.h>
 
 #endif /* __G_LIB_H__ */