Havoc Pennington's implementation of convenient character set conversion
[platform/upstream/glib.git] / glib / glib.h
index 12f3fba..0c4d9f5 100644 (file)
@@ -2,28 +2,91 @@
  * 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 Library General Public
+ * 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
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * 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/. 
+ */
+
 #ifndef __G_LIB_H__
 #define __G_LIB_H__
 
-/* system specific config file
+/* 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:
+ *
+ *  G_MINSHORT, G_MAXSHORT
+ *  G_MININT, G_MAXINT
+ *  G_MINLONG, G_MAXLONG
+ *  G_MINFLOAT, G_MAXFLOAT
+ *  G_MINDOUBLE, G_MAXDOUBLE
+ *
+ * It also provides the following typedefs:
+ *
+ *  gint8, guint8
+ *  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). 
+ *
+ * And it provides a way to store and retrieve a `gint' in/from a `gpointer'.
+ * This is useful to pass an integer instead of a pointer to a callback.
+ *
+ *  GINT_TO_POINTER (i), GUINT_TO_POINTER (i)
+ *  GPOINTER_TO_INT (p), GPOINTER_TO_UINT (p)
+ *
+ * Finally, it provides the following wrappers to STDC functions:
+ *
+ *  void g_memmove (gpointer dest, gconstpointer void *src, gulong count);
+ *    A wrapper for STDC memmove, or an implementation, if memmove doesn't
+ *    exist.  The prototype looks like the above, give or take a const,
+ *    or size_t.
  */
 #include <glibconfig.h>
 
-/* support standard arg inline functions for assertment macros
+/* 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>
 
 #endif
 
 
-/* glib provides definitions for the extrema of many
- *  of the standard types. These are:
- * G_MINFLOAT
- * G_MAXFLOAT
- * G_MINDOUBLE
- * G_MAXDOUBLE
- * G_MINSHORT
- * G_MAXSHORT
- * G_MININT
- * G_MAXINT
- * G_MINLONG
- * G_MAXLONG
- */
-
-#ifdef HAVE_FLOAT_H
-
-#include <float.h>
-
-#define G_MINFLOAT   FLT_MIN
-#define G_MAXFLOAT   FLT_MAX
-#define G_MINDOUBLE  DBL_MIN
-#define G_MAXDOUBLE  DBL_MAX
-
-#elif HAVE_VALUES_H
-
-#include <values.h>
+#ifdef G_OS_WIN32
 
-#define G_MINFLOAT  MINFLOAT
-#define G_MAXFLOAT  MAXFLOAT
-#define G_MINDOUBLE MINDOUBLE
-#define G_MAXDOUBLE MAXDOUBLE
-
-#endif /* HAVE_VALUES_H */
-
-#ifdef HAVE_LIMITS_H
-
-#include <limits.h>
+/* On native Win32, directory separator is the backslash, and search path
+ * separator is the semicolon.
+ */
+#define G_DIR_SEPARATOR '\\'
+#define G_DIR_SEPARATOR_S "\\"
+#define G_SEARCHPATH_SEPARATOR ';'
+#define G_SEARCHPATH_SEPARATOR_S ";"
 
-#define G_MINSHORT  SHRT_MIN
-#define G_MAXSHORT  SHRT_MAX
-#define G_MININT    INT_MIN
-#define G_MAXINT    INT_MAX
-#define G_MINLONG   LONG_MIN
-#define G_MAXLONG   LONG_MAX
+#else  /* !G_OS_WIN32 */
 
-#elif HAVE_VALUES_H
+/* Unix */
 
-#ifdef HAVE_FLOAT_H
-#include <values.h>
-#endif /* HAVE_FLOAT_H */
+#define G_DIR_SEPARATOR '/'
+#define G_DIR_SEPARATOR_S "/"
+#define G_SEARCHPATH_SEPARATOR ':'
+#define G_SEARCHPATH_SEPARATOR_S ":"
 
-#define G_MINSHORT  MINSHORT
-#define G_MAXSHORT  MAXSHORT
-#define G_MININT    MININT
-#define G_MAXINT    MAXINT
-#define G_MINLONG   MINLONG
-#define G_MAXLONG   MAXLONG
+#endif /* !G_OS_WIN32 */
 
-#endif /* HAVE_VALUES_H */
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
 
 
 /* Provide definitions for some commonly used macros.
  *  been defined. It is assumed that if they are already
  *  defined then the current definition is correct.
  */
-#ifndef        NULL
-#define        NULL    ((void*) 0)
+#ifndef NULL
+#  ifdef __cplusplus
+#    define NULL        (0L)
+#  else /* !__cplusplus */
+#    define NULL        ((void*) 0)
+#  endif /* !__cplusplus */
 #endif
 
 #ifndef        FALSE
 #undef CLAMP
 #define CLAMP(x, low, high)  (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
 
+#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.
  */
 #if !defined (G_VA_COPY)
 #  if defined (__GNUC__) && defined (__PPC__) && (defined (_CALL_SYSV) || defined (_WIN32))
-#  define G_VA_COPY(ap1, ap2)     (*(ap1) = *(ap2))
+#    define G_VA_COPY(ap1, ap2)          (*(ap1) = *(ap2))
 #  elif defined (G_VA_COPY_AS_ARRAY)
-#  define G_VA_COPY(ap1, ap2)     g_memmove ((ap1), (ap2), sizeof (va_list))
+#    define G_VA_COPY(ap1, ap2)          g_memmove ((ap1), (ap2), sizeof (va_list))
 #  else /* va_list is a pointer */
-#  define G_VA_COPY(ap1, ap2)     ((ap1) = (ap2))
+#    define G_VA_COPY(ap1, ap2)          ((ap1) = (ap2))
 #  endif /* va_list is a pointer */
 #endif /* !G_VA_COPY */
 
 
-/* Provide simple enum value macro wrappers that ease automated
- * enum value stringification code. [abandoned]
+/* Provide convenience macros for handling structure
+ * fields through their offsets.
  */
-#if    !defined (G_CODE_GENERATION)
-#define G_ENUM( EnumerationName )              EnumerationName
-#define G_FLAGS( EnumerationName )             EnumerationName
-#define G_NV( VALUE_NAME , value_nick, VALUE)  VALUE_NAME = (VALUE)
-#define G_SV( VALUE_NAME, value_nick )         VALUE_NAME
-#else  /* G_CODE_GENERATION */
-#define G_ENUM( EnumerationName )              G_ENUM_E + EnumerationName +
-#define G_FLAGS( EnumerationName )             G_ENUM_F + EnumerationName +
-#define G_NV( VALUE_NAME , value_nick, VALUE)  G_ENUM_V + VALUE_NAME + value_nick +
-#define G_SV( VALUE_NAME, value_nick )         G_ENUM_V + VALUE_NAME + value_nick +
-#endif /* G_CODE_GENERATION */
+#define G_STRUCT_OFFSET(struct_type, member)   \
+    ((glong) ((guint8*) &((struct_type*) 0)->member))
+#define G_STRUCT_MEMBER_P(struct_p, 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)))
+
+
+/* inlining hassle. for compilers that don't allow the `inline' keyword,
+ * mostly because of strict ANSI C compliance or dumbness, we try to fall
+ * back to either `__inline__' or `__inline'.
+ * we define G_CAN_INLINE, if the compiler seems to be actually
+ * *capable* to do function inlining, in which case inline function bodys
+ * do make sense. we also define G_INLINE_FUNC to properly export the
+ * function prototypes if no inlining can be performed.
+ * inline function bodies have to be special cased with G_CAN_INLINE and a
+ * .c file specific macro to allow one compiled instance with extern linkage
+ * of the functions by defining G_IMPLEMENT_INLINES and the .c file macro.
+ */
+#ifdef G_IMPLEMENT_INLINES
+#  define G_INLINE_FUNC extern
+#  undef  G_CAN_INLINE
+#endif
+#ifndef G_INLINE_FUNC
+#  define G_CAN_INLINE 1
+#endif
+#if defined (G_HAVE_INLINE) && defined (__GNUC__) && defined (__STRICT_ANSI__)
+#  undef inline
+#  define inline __inline__
+#elif !defined (G_HAVE_INLINE)
+#  undef inline
+#  if defined (G_HAVE___INLINE__)
+#    define inline __inline__
+#  elif defined (G_HAVE___INLINE)
+#    define inline __inline
+#  else /* !inline && !__inline__ && !__inline */
+#    define inline  /* don't inline, then */
+#    ifndef G_INLINE_FUNC
+#      undef G_CAN_INLINE
+#    endif
+#  endif
+#endif
+#ifndef G_INLINE_FUNC
+#  if defined (__GNUC__) && (__OPTIMIZE__)
+#    define G_INLINE_FUNC extern inline
+#  elif defined (G_CAN_INLINE) && !defined (__GNUC__)
+#    define G_INLINE_FUNC static inline
+#  else /* can't inline */
+#    define G_INLINE_FUNC extern
+#    undef G_CAN_INLINE
+#  endif
+#endif /* !G_INLINE_FUNC */
 
 
 /* Provide simple macro statement wrappers (adapted from Perl):
 #endif
 
 
-/* ANSI does not permit the keyword `inline'.
- */
-#if defined (__STRICT_ANSI__)
-#  undef inline
-#  ifdef __GNUC__
-#    define inline     __inline__
-#  else /* !__GNUC__ */
-#    define inline     /* don't inline */
-#  endif /* !__GNUC__ */
-#endif /* __STRICT_ANSI__ */
-
-/* When using gcc we want to use `extern inline' to avoid random
- * warnings with -Wall.  */
-#ifdef __GNUC__
-/* We want to also have a non-inlined version of the function
- * available.  We implement this by redefining GLIB_INLINE in a glib
- * implementation file.  */
-#  ifndef GLIB_INLINE
-#    define GLIB_INLINE extern inline
-#  endif
-#else
-#  undef GLIB_INLINE
-#  define GLIB_INLINE inline
-#endif
-
 /* Provide macros to feature the GCC function attribute.
  */
 #if    __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
   __attribute__((noreturn))
 #define G_GNUC_CONST                           \
   __attribute__((const))
+#define G_GNUC_UNUSED                          \
+  __attribute__((unused))
 #else  /* !__GNUC__ */
 #define G_GNUC_PRINTF( format_idx, arg_idx )
 #define G_GNUC_SCANF( format_idx, arg_idx )
 #define G_GNUC_FORMAT( arg_idx )
 #define G_GNUC_NORETURN
 #define G_GNUC_CONST
+#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.
  */
 #ifdef __GNUC__
-#define        G_GNUC_FUNCTION         (__FUNCTION__)
-#define        G_GNUC_PRETTY_FUNCTION  (__PRETTY_FUNCTION__)
+#define        G_GNUC_FUNCTION         __FUNCTION__
+#define        G_GNUC_PRETTY_FUNCTION  __PRETTY_FUNCTION__
 #else  /* !__GNUC__ */
-#define        G_GNUC_FUNCTION         ("")
-#define        G_GNUC_PRETTY_FUNCTION  ("")
+#define        G_GNUC_FUNCTION         ""
+#define        G_GNUC_PRETTY_FUNCTION  ""
 #endif /* !__GNUC__ */
 
+/* we try to provide a usefull equivalent for ATEXIT if it is
+ * not defined, but use is actually abandoned. people should
+ * use g_atexit() instead.
+ */
+#ifndef ATEXIT
+# define ATEXIT(proc)  g_ATEXIT(proc)
+#else
+# define G_NATIVE_ATEXIT
+#endif /* ATEXIT */
 
-/* Hacker macro to place breakpoints for x86 machines.
+/* Hacker macro to place breakpoints for elected machines.
  * Actual use is strongly deprecated of course ;)
  */
-#if    defined (__i386__)
-#define        G_BREAKPOINT()          G_STMT_START{ __asm__ ("int $03"); }G_STMT_END
-#else  /* !__i386__ */
-#define        G_BREAKPOINT()
+#if defined (__i386__) && defined (__GNUC__) && __GNUC__ >= 2
+#  define G_BREAKPOINT()       G_STMT_START{ __asm__ __volatile__ ("int $03"); }G_STMT_END
+#elif defined (__alpha__) && defined (__GNUC__) && __GNUC__ >= 2
+#  define G_BREAKPOINT()       G_STMT_START{ __asm__ __volatile__ ("bpt"); }G_STMT_END
+#else  /* !__i386__ && !__alpha__ */
+#  define G_BREAKPOINT()       G_STMT_START{ raise (5 /* SIGTRAP */); }G_STMT_END
 #endif /* __i386__ */
 
 
-#ifndef ATEXIT
-#  ifdef HAVE_ATEXIT
-#    ifdef NeXT /* @#%@! NeXTStep */
-#      define ATEXIT(proc)   (!atexit (proc))
-#    else
-#      define ATEXIT(proc)   (atexit (proc))
-#    endif /* NeXT */
-#  elif defined (HAVE_ON_EXIT)
-#    define ATEXIT(proc)   (on_exit ((void (*)(int, void *))(proc), NULL))
-#  endif
-#endif /* ATEXIT */
-
-
 /* Provide macros for easily allocating memory. The macros
  *  will cast the allocated memory to the specified type
  *  in order to avoid compiler warnings. (Makes the code neater).
  */
 
 #ifdef __DMALLOC_H__
-
-#define g_new(type, count)      (ALLOC (type, count))
-#define g_new0(type, count)     (CALLOC (type, count))
-
+#  define g_new(type, count)           (ALLOC (type, count))
+#  define g_new0(type, count)          (CALLOC (type, count))
+#  define g_renew(type, mem, count)    (REALLOC (mem, type, count))
 #else /* __DMALLOC_H__ */
-
-#define g_new(type, count)       \
-    ((type *) g_malloc ((unsigned) sizeof (type) * (count)))
-#define g_new0(type, count)      \
-    ((type *) g_malloc0 ((unsigned) sizeof (type) * (count)))
+#  define g_new(type, count)     \
+      ((type *) g_malloc ((unsigned) sizeof (type) * (count)))
+#  define g_new0(type, count)    \
+      ((type *) g_malloc0 ((unsigned) sizeof (type) * (count)))
+#  define g_renew(type, mem, count)      \
+      ((type *) g_realloc (mem, (unsigned) sizeof (type) * (count)))
 #endif /* __DMALLOC_H__ */
 
 #define g_mem_chunk_create(type, pre_alloc, alloc_type)        ( \
 } G_STMT_END
 
 
-#define g_string(x) #x
-
-
 /* Provide macros for error handling. The "assert" macros will
  *  exit on failure. The "return" macros will exit the current
  *  function. Two different definitions are given for the macros
 
 #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 */
 
        {                                                               \
         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__,                                    \
        {                                                               \
         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{           \
        {                                                       \
         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);                                         \
        {                                                       \
         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
 
-#endif /* !__GNUC__ */
+#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
 
-#endif /* !G_DISABLE_CHECKS */
+#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__ */
 
-#ifdef __cplusplus
-/* the #pragma } statment is used to fix up emacs' c-mode which gets
- * confused by extern "C" {. the ansi standard says that compilers
- * have to ignore #pragma directives that they don't know about,
- * so we should be save in using this.
- */
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+#endif /* !G_DISABLE_CHECKS */
 
 
 /* Provide type definitions for commonly used types.
@@ -446,6 +532,7 @@ typedef short  gshort;
 typedef long   glong;
 typedef int    gint;
 typedef gint   gboolean;
+typedef gchar* gstring;
 
 typedef unsigned char  guchar;
 typedef unsigned short gushort;
@@ -469,101 +556,225 @@ typedef double gldouble;
 typedef void* gpointer;
 typedef const void *gconstpointer;
 
-#if (SIZEOF_CHAR == 1)
-typedef signed char    gint8;
-typedef unsigned char  guint8;
-#endif /* SIZEOF_CHAR */
-
-#if (SIZEOF_SHORT == 2)
-typedef signed short   gint16;
-typedef unsigned short guint16;
-#endif /* SIZEOF_SHORT */
-
-#if (SIZEOF_INT == 4)
-typedef signed int     gint32;
-typedef unsigned int   guint32;
-#elif (SIZEOF_LONG == 4)
-typedef signed long    gint32;
-typedef unsigned long  guint32;
-#endif /* SIZEOF_INT */
-
-#if (SIZEOF_LONG == 8)
-#define HAVE_GINT64 1
-typedef signed long gint64;
-typedef unsigned long guint64;
-#elif (SIZEOF_LONG_LONG == 8)
-#define HAVE_GINT64 1
-typedef signed long long gint64;
-typedef unsigned long long guint64;
-#else
-/* No gint64 */
-#undef HAVE_GINT64
-#endif
 
+typedef guint32 GQuark;
+typedef gint32 GTime;
 
-/* Define macros for storing integers inside pointers
+
+/* Portable endian checks and conversions
+ *
+ * glibconfig.h defines G_BYTE_ORDER which expands to one of
+ * the below macros.
  */
-#if (SIZEOF_INT == SIZEOF_VOID_P)
+#define G_LITTLE_ENDIAN 1234
+#define G_BIG_ENDIAN    4321
+#define G_PDP_ENDIAN    3412           /* unused, need specific PDP check */   
 
-#define GPOINTER_TO_INT(p) ((gint)(p))
-#define GPOINTER_TO_UINT(p) ((guint)(p))
 
-#define GINT_TO_POINTER(i) ((gpointer)(i))
-#define GUINT_TO_POINTER(u) ((gpointer)(u))
+/* Basic bit swapping functions
+ */
+#define GUINT16_SWAP_LE_BE_CONSTANT(val)       ((guint16) ( \
+    (((guint16) (val) & (guint16) 0x00ffU) << 8) | \
+    (((guint16) (val) & (guint16) 0xff00U) >> 8)))
+#define GUINT32_SWAP_LE_BE_CONSTANT(val)       ((guint32) ( \
+    (((guint32) (val) & (guint32) 0x000000ffU) << 24) | \
+    (((guint32) (val) & (guint32) 0x0000ff00U) <<  8) | \
+    (((guint32) (val) & (guint32) 0x00ff0000U) >>  8) | \
+    (((guint32) (val) & (guint32) 0xff000000U) >> 24)))
+
+/* Intel specific stuff for speed
+ */
+#if defined (__i386__) && defined (__GNUC__) && __GNUC__ >= 2
+#  define GUINT16_SWAP_LE_BE_X86(val) \
+     (__extension__                                    \
+      ({ register guint16 __v;                         \
+        if (__builtin_constant_p (val))                \
+          __v = GUINT16_SWAP_LE_BE_CONSTANT (val);     \
+        else                                           \
+          __asm__ __const__ ("rorw $8, %w0"            \
+                             : "=r" (__v)              \
+                             : "0" ((guint16) (val))); \
+       __v; }))
+#  define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_X86 (val))
+#  if !defined(__i486__) && !defined(__i586__) \
+      && !defined(__pentium__) && !defined(__i686__) && !defined(__pentiumpro__)
+#     define GUINT32_SWAP_LE_BE_X86(val) \
+        (__extension__                                         \
+         ({ register guint32 __v;                              \
+           if (__builtin_constant_p (val))                     \
+             __v = GUINT32_SWAP_LE_BE_CONSTANT (val);          \
+         else                                                  \
+           __asm__ __const__ ("rorw $8, %w0\n\t"               \
+                              "rorl $16, %0\n\t"               \
+                              "rorw $8, %w0"                   \
+                              : "=r" (__v)                     \
+                              : "0" ((guint32) (val)));        \
+       __v; }))
+#  else /* 486 and higher has bswap */
+#     define GUINT32_SWAP_LE_BE_X86(val) \
+        (__extension__                                         \
+         ({ register guint32 __v;                              \
+           if (__builtin_constant_p (val))                     \
+             __v = GUINT32_SWAP_LE_BE_CONSTANT (val);          \
+         else                                                  \
+           __asm__ __const__ ("bswap %0"                       \
+                              : "=r" (__v)                     \
+                              : "0" ((guint32) (val)));        \
+       __v; }))
+#  endif /* processor specific 32-bit stuff */
+#  define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_X86 (val))
+#else /* !__i386__ */
+#  define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_CONSTANT (val))
+#  define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_CONSTANT (val))
+#endif /* __i386__ */
+
+#ifdef G_HAVE_GINT64
+#  define GUINT64_SWAP_LE_BE_CONSTANT(val)     ((guint64) ( \
+      (((guint64) (val) &                                              \
+       (guint64) G_GINT64_CONSTANT(0x00000000000000ffU)) << 56) |      \
+      (((guint64) (val) &                                              \
+       (guint64) G_GINT64_CONSTANT(0x000000000000ff00U)) << 40) |      \
+      (((guint64) (val) &                                              \
+       (guint64) G_GINT64_CONSTANT(0x0000000000ff0000U)) << 24) |      \
+      (((guint64) (val) &                                              \
+       (guint64) G_GINT64_CONSTANT(0x00000000ff000000U)) <<  8) |      \
+      (((guint64) (val) &                                              \
+       (guint64) G_GINT64_CONSTANT(0x000000ff00000000U)) >>  8) |      \
+      (((guint64) (val) &                                              \
+       (guint64) G_GINT64_CONSTANT(0x0000ff0000000000U)) >> 24) |      \
+      (((guint64) (val) &                                              \
+       (guint64) G_GINT64_CONSTANT(0x00ff000000000000U)) >> 40) |      \
+      (((guint64) (val) &                                              \
+       (guint64) G_GINT64_CONSTANT(0xff00000000000000U)) >> 56)))
+#  if defined (__i386__) && defined (__GNUC__) && __GNUC__ >= 2
+#    define GUINT64_SWAP_LE_BE_X86(val) \
+       (__extension__                                          \
+        ({ union { guint64 __ll;                               \
+                   guint32 __l[2]; } __r;                      \
+           if (__builtin_constant_p (val))                     \
+             __r.__ll = GUINT64_SWAP_LE_BE_CONSTANT (val);     \
+           else                                                \
+             {                                                 \
+               union { guint64 __ll;                           \
+                       guint32 __l[2]; } __w;                  \
+               __w.__ll = ((guint64) val);                     \
+               __r.__l[0] = GUINT32_SWAP_LE_BE (__w.__l[1]);   \
+               __r.__l[1] = GUINT32_SWAP_LE_BE (__w.__l[0]);   \
+             }                                                 \
+         __r.__ll; }))
+#    define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_X86 (val))
+#  else /* !__i386__ */
+#    define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_CONSTANT(val))
+#  endif
+#endif
 
-#elif (SIZEOF_LONG == SIZEOF_VOID_P)
+#define GUINT16_SWAP_LE_PDP(val)       ((guint16) (val))
+#define GUINT16_SWAP_BE_PDP(val)       (GUINT16_SWAP_LE_BE (val))
+#define GUINT32_SWAP_LE_PDP(val)       ((guint32) ( \
+    (((guint32) (val) & (guint32) 0x0000ffffU) << 16) | \
+    (((guint32) (val) & (guint32) 0xffff0000U) >> 16)))
+#define GUINT32_SWAP_BE_PDP(val)       ((guint32) ( \
+    (((guint32) (val) & (guint32) 0x00ff00ffU) << 8) | \
+    (((guint32) (val) & (guint32) 0xff00ff00U) >> 8)))
+
+/* The G*_TO_?E() macros are defined in glibconfig.h.
+ * The transformation is symmetric, so the FROM just maps to the TO.
+ */
+#define GINT16_FROM_LE(val)    (GINT16_TO_LE (val))
+#define GUINT16_FROM_LE(val)   (GUINT16_TO_LE (val))
+#define GINT16_FROM_BE(val)    (GINT16_TO_BE (val))
+#define GUINT16_FROM_BE(val)   (GUINT16_TO_BE (val))
+#define GINT32_FROM_LE(val)    (GINT32_TO_LE (val))
+#define GUINT32_FROM_LE(val)   (GUINT32_TO_LE (val))
+#define GINT32_FROM_BE(val)    (GINT32_TO_BE (val))
+#define GUINT32_FROM_BE(val)   (GUINT32_TO_BE (val))
+
+#ifdef G_HAVE_GINT64
+#define GINT64_FROM_LE(val)    (GINT64_TO_LE (val))
+#define GUINT64_FROM_LE(val)   (GUINT64_TO_LE (val))
+#define GINT64_FROM_BE(val)    (GINT64_TO_BE (val))
+#define GUINT64_FROM_BE(val)   (GUINT64_TO_BE (val))
+#endif
 
-#define GPOINTER_TO_INT(p) ((gint)(glong)(p))
-#define GPOINTER_TO_UINT(p) ((guint)(gulong)(p))
+#define GLONG_FROM_LE(val)     (GLONG_TO_LE (val))
+#define GULONG_FROM_LE(val)    (GULONG_TO_LE (val))
+#define GLONG_FROM_BE(val)     (GLONG_TO_BE (val))
+#define GULONG_FROM_BE(val)    (GULONG_TO_BE (val))
 
-#define GINT_TO_POINTER(i) ((gpointer)(glong)(i))
-#define GUINT_TO_POINTER(u) ((gpointer)(gulong)(u))
+#define GINT_FROM_LE(val)      (GINT_TO_LE (val))
+#define GUINT_FROM_LE(val)     (GUINT_TO_LE (val))
+#define GINT_FROM_BE(val)      (GINT_TO_BE (val))
+#define GUINT_FROM_BE(val)     (GUINT_TO_BE (val))
 
-#else
-#error SIZEOF_VOID_P unknown - This should never happen
-#endif
 
-typedef gint32 gssize;
-typedef guint32 gsize;
-typedef guint32 GQuark;
-typedef gint32 GTime;
+/* Portable versions of host-network order stuff
+ */
+#define g_ntohl(val) (GUINT32_FROM_BE (val))
+#define g_ntohs(val) (GUINT16_FROM_BE (val))
+#define g_htonl(val) (GUINT32_TO_BE (val))
+#define g_htons(val) (GUINT16_TO_BE (val))
 
 
 /* Glib version.
+ * we prefix variable declarations so they can
+ * properly get exported in windows dlls.
  */
-extern const guint glib_major_version;
-extern const guint glib_minor_version;
-extern const guint glib_micro_version;
-extern const guint glib_interface_age;
-extern const guint glib_binary_age;
-
+#ifdef G_OS_WIN32
+#  ifdef GLIB_COMPILATION
+#    define GLIB_VAR __declspec(dllexport)
+#  else /* !GLIB_COMPILATION */
+#    define GLIB_VAR extern __declspec(dllimport)
+#  endif /* !GLIB_COMPILATION */
+#else /* !G_OS_WIN32 */
+#  define GLIB_VAR extern
+#endif /* !G_OS_WIN32 */
+
+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) || \
+     (GLIB_MAJOR_VERSION == (major) && GLIB_MINOR_VERSION > (minor)) || \
+     (GLIB_MAJOR_VERSION == (major) && GLIB_MINOR_VERSION == (minor) && \
+      GLIB_MICRO_VERSION >= (micro)))
 
 /* Forward declarations of glib types.
  */
-
-typedef struct _GList          GList;
-typedef struct _GSList         GSList;
-typedef struct _GHashTable     GHashTable;
-typedef struct _GCache         GCache;
-typedef struct _GTree          GTree;
-typedef struct _GTimer         GTimer;
-typedef struct _GMemChunk      GMemChunk;
-typedef struct _GListAllocator GListAllocator;
-typedef struct _GStringChunk   GStringChunk;
-typedef struct _GString                GString;
+typedef struct _GAllocator     GAllocator;
 typedef struct _GArray         GArray;
-typedef struct _GPtrArray      GPtrArray;
 typedef struct _GByteArray     GByteArray;
-typedef struct _GDebugKey      GDebugKey;
-typedef struct _GScannerConfig GScannerConfig;
-typedef struct _GScanner       GScanner;
-typedef union  _GValue         GValue;
+typedef struct _GCache         GCache;
 typedef struct _GCompletion    GCompletion;
+typedef        struct _GData           GData;
+typedef struct _GDebugKey      GDebugKey;
+typedef union  _GDoubleIEEE754 GDoubleIEEE754;
+typedef union  _GFloatIEEE754  GFloatIEEE754;
+typedef struct _GHashTable     GHashTable;
+typedef struct _GHook          GHook;
+typedef struct _GHookList      GHookList;
+typedef struct _GList          GList;
+typedef struct _GMemChunk      GMemChunk;
+typedef struct _GNode          GNode;
+typedef struct _GPtrArray      GPtrArray;
+typedef struct _GQueue         GQueue;
+typedef struct _GRand          GRand;
 typedef struct _GRelation      GRelation;
+typedef struct _GScanner       GScanner;
+typedef struct _GScannerConfig GScannerConfig;
+typedef struct _GSList         GSList;
+typedef struct _GString                GString;
+typedef struct _GStringChunk   GStringChunk;
+typedef struct _GTimer         GTimer;
+typedef struct _GTrashStack     GTrashStack;
+typedef struct _GTree          GTree;
 typedef struct _GTuples                GTuples;
-typedef struct _GNode          GNode;
-
+typedef union  _GTokenValue    GTokenValue;
+typedef struct _GIOChannel     GIOChannel;
 
+/* Tree traverse flags */
 typedef enum
 {
   G_TRAVERSE_LEAFS     = 1 << 0,
@@ -572,6 +783,7 @@ typedef enum
   G_TRAVERSE_MASK      = 0x03
 } GTraverseFlags;
 
+/* Tree traverse orders */
 typedef enum
 {
   G_IN_ORDER,
@@ -592,7 +804,7 @@ typedef enum
   /* log flags */
   G_LOG_FLAG_RECURSION         = 1 << 0,
   G_LOG_FLAG_FATAL             = 1 << 1,
-
+  
   /* GLib log levels */
   G_LOG_LEVEL_ERROR            = 1 << 2,       /* always fatal */
   G_LOG_LEVEL_CRITICAL         = 1 << 3,
@@ -600,7 +812,7 @@ typedef enum
   G_LOG_LEVEL_MESSAGE          = 1 << 5,
   G_LOG_LEVEL_INFO             = 1 << 6,
   G_LOG_LEVEL_DEBUG            = 1 << 7,
-
+  
   G_LOG_LEVEL_MASK             = ~(G_LOG_FLAG_RECURSION | G_LOG_FLAG_FATAL)
 } GLogLevelFlags;
 
@@ -615,12 +827,31 @@ typedef gint              (*GCompareFunc)         (gconstpointer  a,
                                                 gconstpointer  b);
 typedef gchar*         (*GCompletionFunc)      (gpointer);
 typedef void           (*GDestroyNotify)       (gpointer       data);
+typedef void           (*GDataForeachFunc)     (GQuark         key_id,
+                                                gpointer       data,
+                                                gpointer       user_data);
 typedef void           (*GFunc)                (gpointer       data,
                                                 gpointer       user_data);
 typedef guint          (*GHashFunc)            (gconstpointer  key);
+typedef void           (*GFreeFunc)            (gpointer       data);
 typedef void           (*GHFunc)               (gpointer       key,
                                                 gpointer       value,
                                                 gpointer       user_data);
+typedef gboolean       (*GHRFunc)              (gpointer       key,
+                                                gpointer       value,
+                                                gpointer       user_data);
+typedef gint           (*GHookCompareFunc)     (GHook          *new_hook,
+                                                GHook          *sibling);
+typedef gboolean       (*GHookFindFunc)        (GHook          *hook,
+                                                gpointer        data);
+typedef void           (*GHookMarshaller)      (GHook          *hook,
+                                                gpointer        data);
+typedef gboolean       (*GHookCheckMarshaller) (GHook          *hook,
+                                                gpointer        data);
+typedef void           (*GHookFunc)            (gpointer        data);
+typedef gboolean       (*GHookCheckFunc)       (gpointer        data);
+typedef void           (*GHookFreeFunc)        (GHookList      *hook_list,
+                                                GHook          *hook);
 typedef void           (*GLogFunc)             (const gchar   *log_domain,
                                                 GLogLevelFlags log_level,
                                                 const gchar   *message,
@@ -629,15 +860,32 @@ 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);
 typedef gint           (*GTraverseFunc)        (gpointer       key,
                                                 gpointer       value,
                                                 gpointer       data);
+typedef        void            (*GVoidFunc)            (void);
+
+
+struct _GArray
+{
+  gchar *data;
+  guint len;
+};
+
+struct _GByteArray
+{
+  guint8 *data;
+  guint          len;
+};
 
+struct _GDebugKey
+{
+  gchar *key;
+  guint         value;
+};
 
 struct _GList
 {
@@ -646,6 +894,19 @@ struct _GList
   GList *prev;
 };
 
+struct _GPtrArray
+{
+  gpointer *pdata;
+  guint            len;
+};
+
+struct _GQueue
+{
+  GList *head;
+  GList *tail;
+  guint  length;
+};
+
 struct _GSList
 {
   gpointer data;
@@ -658,45 +919,96 @@ struct _GString
   gint len;
 };
 
-struct _GArray
+struct _GTrashStack
 {
-  gchar *data;
-  guint len;
+  GTrashStack *next;
 };
 
-struct _GByteArray
+struct _GTuples
 {
-  guint8 *data;
-  guint          len;
+  guint len;
 };
 
-struct _GPtrArray
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#include <gerror.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* IEEE Standard 754 Single Precision Storage Format (gfloat):
+ *
+ *        31 30           23 22            0
+ * +--------+---------------+---------------+
+ * | s 1bit | e[30:23] 8bit | f[22:0] 23bit |
+ * +--------+---------------+---------------+
+ * B0------------------->B1------->B2-->B3-->
+ *
+ * IEEE Standard 754 Double Precision Storage Format (gdouble):
+ *
+ *        63 62            52 51            32   31            0
+ * +--------+----------------+----------------+ +---------------+
+ * | s 1bit | e[62:52] 11bit | f[51:32] 20bit | | f[31:0] 32bit |
+ * +--------+----------------+----------------+ +---------------+
+ * B0--------------->B1---------->B2--->B3---->  B4->B5->B6->B7->
+ */
+/* subtract from biased_exponent to form base2 exponent (normal numbers) */
+#define G_IEEE754_FLOAT_BIAS   (127)
+#define G_IEEE754_DOUBLE_BIAS  (1023)
+/* multiply with base2 exponent to get base10 exponent (nomal numbers) */
+#define G_LOG_2_BASE_10                (0.30102999566398119521)
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+union _GFloatIEEE754
 {
-  gpointer *pdata;
-  guint            len;
+  gfloat v_float;
+  struct {
+    guint mantissa : 23;
+    guint biased_exponent : 8;
+    guint sign : 1;
+  } mpn;
 };
-
-struct _GTuples
+union _GDoubleIEEE754
 {
-  guint len;
+  gdouble v_double;
+  struct {
+    guint mantissa_low : 32;
+    guint mantissa_high : 20;
+    guint biased_exponent : 11;
+    guint sign : 1;
+  } mpn;
 };
-
-struct _GDebugKey
+#elif G_BYTE_ORDER == G_BIG_ENDIAN
+union _GFloatIEEE754
 {
-  gchar *key;
-  guint         value;
+  gfloat v_float;
+  struct {
+    guint sign : 1;
+    guint biased_exponent : 8;
+    guint mantissa : 23;
+  } mpn;
 };
-
-struct _GCache { gint dummy; };
-struct _GTree { gint dummy; };
-struct _GTimer { gint dummy; };
-struct _GMemChunk { gint dummy; };
-struct _GListAllocator { gint dummy; };
-struct _GStringChunk { gint dummy; };
+union _GDoubleIEEE754
+{
+  gdouble v_double;
+  struct {
+    guint sign : 1;
+    guint biased_exponent : 11;
+    guint mantissa_high : 20;
+    guint mantissa_low : 32;
+  } mpn;
+};
+#else /* !G_LITTLE_ENDIAN && !G_BIG_ENDIAN */
+#error unknown ENDIAN type
+#endif /* !G_LITTLE_ENDIAN && !G_BIG_ENDIAN */
 
 
 /* Doubly linked lists
  */
+void   g_list_push_allocator    (GAllocator     *allocator);
+void   g_list_pop_allocator     (void);
 GList* g_list_alloc            (void);
 void   g_list_free             (GList          *list);
 void   g_list_free_1           (GList          *list);
@@ -713,27 +1025,32 @@ 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,
+                                GList          *link);
 GList* g_list_reverse          (GList          *list);
+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);
 void   g_list_foreach          (GList          *list,
                                 GFunc           func,
                                 gpointer        user_data);
+GList* g_list_sort              (GList          *list,
+                                GCompareFunc    compare_func);
 gpointer g_list_nth_data       (GList          *list,
                                 guint           n);
 #define g_list_previous(list)  ((list) ? (((GList *)(list))->prev) : NULL)
@@ -742,6 +1059,8 @@ gpointer g_list_nth_data   (GList          *list,
 
 /* Singly linked lists
  */
+void    g_slist_push_allocator  (GAllocator     *allocator);
+void    g_slist_pop_allocator   (void);
 GSList* g_slist_alloc          (void);
 void   g_slist_free            (GSList         *list);
 void   g_slist_free_1          (GSList         *list);
@@ -755,41 +1074,61 @@ 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         *llink);
+                                GSList         *link);
+GSList* g_slist_delete_link     (GSList         *list,
+                                GSList         *link);
 GSList* g_slist_reverse                (GSList         *list);
+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,
                                 GFunc           func,
                                 gpointer        user_data);
+GSList*  g_slist_sort           (GSList          *list,
+                                GCompareFunc    compare_func);
 gpointer g_slist_nth_data      (GSList         *list,
                                 guint           n);
-#define g_slist_next(slist)    ((slist) ? (((GSList *)(slist))->next) : NULL)
+#define  g_slist_next(slist)   ((slist) ? (((GSList *)(slist))->next) : NULL)
 
 
-/* List Allocators
+/* Queues
  */
-GListAllocator* g_list_allocator_new  (void);
-void           g_list_allocator_free (GListAllocator* allocator);
-GListAllocator* g_slist_set_allocator (GListAllocator* allocator);
-GListAllocator* g_list_set_allocator  (GListAllocator* allocator);
-
+GQueue*  g_queue_new            (void);
+void     g_queue_free           (GQueue  *queue);
+void     g_queue_push_head      (GQueue  *queue,
+                                gpointer data);
+void     g_queue_push_tail      (GQueue  *queue,
+                                gpointer data);
+gpointer g_queue_pop_head       (GQueue  *queue);
+gpointer g_queue_pop_tail       (GQueue  *queue);
+gboolean g_queue_is_empty       (GQueue  *queue);
+gpointer g_queue_peek_head      (GQueue  *queue);
+gpointer g_queue_peek_tail      (GQueue  *queue);
+void     g_queue_push_head_link (GQueue  *queue,
+                                GList   *link);
+void     g_queue_push_tail_link (GQueue  *queue,
+                                GList   *link);
+GList*   g_queue_pop_head_link  (GQueue  *queue);
+GList*   g_queue_pop_tail_link  (GQueue  *queue);
 
 /* Hash tables
  */
@@ -807,13 +1146,18 @@ 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);
-gint       g_hash_table_size           (GHashTable     *hash_table);
+guint      g_hash_table_foreach_remove (GHashTable     *hash_table,
+                                        GHRFunc         func,
+                                        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
  */
@@ -828,7 +1172,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);
@@ -845,16 +1189,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);
 
@@ -876,9 +1220,12 @@ struct _GNode
                                 ((GNode*) (node))->next == NULL)
 #define         G_NODE_IS_LEAF(node)   (((GNode*) (node))->children == NULL)
 
+void     g_node_push_allocator  (GAllocator       *allocator);
+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);
@@ -957,6 +1304,129 @@ GNode*    g_node_last_sibling     (GNode           *node);
                                         ((GNode*) (node))->children : NULL)
 
 
+/* Callback maintenance functions
+ */
+#define G_HOOK_FLAG_USER_SHIFT (4)
+typedef enum
+{
+  G_HOOK_FLAG_ACTIVE   = 1 << 0,
+  G_HOOK_FLAG_IN_CALL  = 1 << 1,
+  G_HOOK_FLAG_MASK     = 0x0f
+} GHookFlagMask;
+
+#define        G_HOOK_DEFERRED_DESTROY ((GHookFreeFunc) 0x01)
+
+struct _GHookList
+{
+  guint                 seq_id;
+  guint                 hook_size;
+  guint                 is_setup : 1;
+  GHook                *hooks;
+  GMemChunk    *hook_memchunk;
+  GHookFreeFunc         hook_free; /* virtual function */
+  GHookFreeFunc         hook_destroy; /* virtual function */
+};
+
+struct _GHook
+{
+  gpointer      data;
+  GHook                *next;
+  GHook                *prev;
+  guint                 ref_count;
+  guint                 hook_id;
+  guint                 flags;
+  gpointer      func;
+  GDestroyNotify destroy;
+};
+
+#define        G_HOOK_ACTIVE(hook)             ((((GHook*) hook)->flags & \
+                                         G_HOOK_FLAG_ACTIVE) != 0)
+#define        G_HOOK_IN_CALL(hook)            ((((GHook*) hook)->flags & \
+                                         G_HOOK_FLAG_IN_CALL) != 0)
+#define G_HOOK_IS_VALID(hook)          (((GHook*) hook)->hook_id != 0 && \
+                                        G_HOOK_ACTIVE (hook))
+#define G_HOOK_IS_UNLINKED(hook)       (((GHook*) hook)->next == NULL && \
+                                        ((GHook*) hook)->prev == NULL && \
+                                        ((GHook*) hook)->hook_id == 0 && \
+                                        ((GHook*) hook)->ref_count == 0)
+
+void    g_hook_list_init               (GHookList              *hook_list,
+                                        guint                   hook_size);
+void    g_hook_list_clear              (GHookList              *hook_list);
+GHook*  g_hook_alloc                   (GHookList              *hook_list);
+void    g_hook_free                    (GHookList              *hook_list,
+                                        GHook                  *hook);
+void    g_hook_ref                     (GHookList              *hook_list,
+                                        GHook                  *hook);
+void    g_hook_unref                   (GHookList              *hook_list,
+                                        GHook                  *hook);
+gboolean g_hook_destroy                        (GHookList              *hook_list,
+                                        guint                   hook_id);
+void    g_hook_destroy_link            (GHookList              *hook_list,
+                                        GHook                  *hook);
+void    g_hook_prepend                 (GHookList              *hook_list,
+                                        GHook                  *hook);
+void    g_hook_insert_before           (GHookList              *hook_list,
+                                        GHook                  *sibling,
+                                        GHook                  *hook);
+void    g_hook_insert_sorted           (GHookList              *hook_list,
+                                        GHook                  *hook,
+                                        GHookCompareFunc        func);
+GHook*  g_hook_get                     (GHookList              *hook_list,
+                                        guint                   hook_id);
+GHook*  g_hook_find                    (GHookList              *hook_list,
+                                        gboolean                need_valids,
+                                        GHookFindFunc           func,
+                                        gpointer                data);
+GHook*  g_hook_find_data               (GHookList              *hook_list,
+                                        gboolean                need_valids,
+                                        gpointer                data);
+GHook*  g_hook_find_func               (GHookList              *hook_list,
+                                        gboolean                need_valids,
+                                        gpointer                func);
+GHook*  g_hook_find_func_data          (GHookList              *hook_list,
+                                        gboolean                need_valids,
+                                        gpointer                func,
+                                        gpointer                data);
+/* return the first valid hook, and increment its reference count */
+GHook*  g_hook_first_valid             (GHookList              *hook_list,
+                                        gboolean                may_be_in_call);
+/* return the next valid hook with incremented reference count, and
+ * decrement the reference count of the original hook
+ */
+GHook*  g_hook_next_valid              (GHookList              *hook_list,
+                                        GHook                  *hook,
+                                        gboolean                may_be_in_call);
+
+/* GHookCompareFunc implementation to insert hooks sorted by their id */
+gint    g_hook_compare_ids             (GHook                  *new_hook,
+                                        GHook                  *sibling);
+
+/* convenience macros */
+#define         g_hook_append( hook_list, hook )  \
+     g_hook_insert_before ((hook_list), NULL, (hook))
+
+/* invoke all valid hooks with the (*GHookFunc) signature.
+ */
+void    g_hook_list_invoke             (GHookList              *hook_list,
+                                        gboolean                may_recurse);
+/* invoke all valid hooks with the (*GHookCheckFunc) signature,
+ * and destroy the hook if FALSE is returned.
+ */
+void    g_hook_list_invoke_check       (GHookList              *hook_list,
+                                        gboolean                may_recurse);
+/* invoke a marshaller on all valid hooks.
+ */
+void    g_hook_list_marshal            (GHookList              *hook_list,
+                                        gboolean                may_recurse,
+                                        GHookMarshaller         marshaller,
+                                        gpointer                data);
+void    g_hook_list_marshal_check      (GHookList              *hook_list,
+                                        gboolean                may_recurse,
+                                        GHookCheckMarshaller    marshaller,
+                                        gpointer                data);
+
+
 /* Fatal error handlers.
  * g_on_error_query() will prompt the user to either
  * [E]xit, [H]alt, [P]roceed or show [S]tack trace.
@@ -972,7 +1442,7 @@ void g_on_error_stack_trace (const gchar *prg_name);
 
 /* Logging mechanism
  */
-extern const gchar                     *g_log_domain_glib;
+extern         const gchar             *g_log_domain_glib;
 guint          g_log_set_handler       (const gchar    *log_domain,
                                         GLogLevelFlags  log_levels,
                                         GLogFunc        log_func,
@@ -995,20 +1465,36 @@ GLogLevelFlags   g_log_set_fatal_mask    (const gchar    *log_domain,
                                         GLogLevelFlags  fatal_mask);
 GLogLevelFlags g_log_set_always_fatal  (GLogLevelFlags  fatal_mask);
 #ifndef        G_LOG_DOMAIN
-#define        G_LOG_DOMAIN    (NULL)
+#define        G_LOG_DOMAIN    ((gchar*) 0)
 #endif /* G_LOG_DOMAIN */
-#ifdef __GNUC__
-#define        g_error(format, args...)        g_log (G_LOG_DOMAIN, \
-                                              G_LOG_LEVEL_ERROR, \
-                                              format, ##args)
-#define        g_message(format, args...)      g_log (G_LOG_DOMAIN, \
-                                              G_LOG_LEVEL_MESSAGE, \
-                                              format, ##args)
-#define        g_warning(format, args...)      g_log (G_LOG_DOMAIN, \
-                                              G_LOG_LEVEL_WARNING, \
-                                              format, ##args)
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#define        g_error(...)    g_log (G_LOG_DOMAIN,         \
+                              G_LOG_LEVEL_ERROR,    \
+                              __VA_ARGS__)
+#define        g_message(...)  g_log (G_LOG_DOMAIN,         \
+                              G_LOG_LEVEL_MESSAGE,  \
+                              __VA_ARGS__)
+#define        g_critical(...) g_log (G_LOG_DOMAIN,         \
+                              G_LOG_LEVEL_CRITICAL, \
+                              __VA_ARGS__)
+#define        g_warning(...)  g_log (G_LOG_DOMAIN,         \
+                              G_LOG_LEVEL_WARNING,  \
+                              __VA_ARGS__)
+#elif defined (__GNUC__)
+#define        g_error(format...)      g_log (G_LOG_DOMAIN,         \
+                                      G_LOG_LEVEL_ERROR,    \
+                                      format)
+#define        g_message(format...)    g_log (G_LOG_DOMAIN,         \
+                                      G_LOG_LEVEL_MESSAGE,  \
+                                      format)
+#define        g_critical(format...)   g_log (G_LOG_DOMAIN,         \
+                                      G_LOG_LEVEL_CRITICAL, \
+                                      format)
+#define        g_warning(format...)    g_log (G_LOG_DOMAIN,         \
+                                      G_LOG_LEVEL_WARNING,  \
+                                      format)
 #else  /* !__GNUC__ */
-static inline void
+static void
 g_error (const gchar *format,
         ...)
 {
@@ -1017,7 +1503,7 @@ g_error (const gchar *format,
   g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, format, args);
   va_end (args);
 }
-static inline void
+static void
 g_message (const gchar *format,
           ...)
 {
@@ -1026,7 +1512,16 @@ g_message (const gchar *format,
   g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, format, args);
   va_end (args);
 }
-static inline void
+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,
           ...)
 {
@@ -1075,6 +1570,16 @@ void      g_free        (gpointer  mem);
 void    g_mem_profile (void);
 void    g_mem_check   (gpointer  mem);
 
+/* Generic allocators
+ */
+GAllocator* g_allocator_new   (const gchar  *name,
+                              guint         n_preallocs);
+void        g_allocator_free  (GAllocator   *allocator);
+
+#define        G_ALLOCATOR_LIST        (1)
+#define        G_ALLOCATOR_SLIST       (2)
+#define        G_ALLOCATOR_NODE        (3)
+
 
 /* "g_mem_chunk_new" creates a new memory chunk.
  * Memory chunks are used to allocate pieces of memory which are
@@ -1125,6 +1630,10 @@ void g_blow_chunks (void);
 
 /* Timer
  */
+
+/* microseconds per second */
+#define G_USEC_PER_SEC 1000000
+
 GTimer* g_timer_new    (void);
 void   g_timer_destroy (GTimer  *timer);
 void   g_timer_start   (GTimer  *timer);
@@ -1132,39 +1641,105 @@ void   g_timer_stop    (GTimer  *timer);
 void   g_timer_reset   (GTimer  *timer);
 gdouble g_timer_elapsed (GTimer         *timer,
                         gulong  *microseconds);
+void    g_usleep        (gulong microseconds);
 
-
-/* String utility functions
+/* String utility functions that modify a string argument or
+ * return a constant string that must not be freed.
  */
-#define G_STR_DELIMITERS       "_-|> <."
-void   g_strdelimit            (gchar       *string,
+#define         G_STR_DELIMITERS       "_-|> <."
+gchar*  g_strdelimit           (gchar       *string,
                                 const gchar *delimiters,
                                 gchar        new_delimiter);
-gchar* g_strdup                (const gchar *str);
-gchar* g_strdup_printf         (const gchar *format,
+gchar*  g_strcanon             (gchar       *string,
+                                const gchar *valid_chars,
+                                gchar        subsitutor);
+gdouble         g_strtod               (const gchar *nptr,
+                                gchar      **endptr);
+gchar*  g_strerror             (gint         errnum);
+gchar*  g_strsignal            (gint         signum);
+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);
+gchar*  g_strreverse           (gchar       *string);
+gsize   g_strlcpy              (gchar       *dest,
+                                const gchar *src,
+                                gsize        dest_size);
+gsize   g_strlcat              (gchar       *dest,
+                                const gchar *src,
+                                gsize        dest_size);
+/* removes leading spaces */
+gchar*   g_strchug              (gchar        *string);
+/* removes trailing spaces */
+gchar*  g_strchomp              (gchar        *string);
+/* removes leading & trailing spaces */
+#define g_strstrip( string )   g_strchomp (g_strchug (string))
+
+/* String utility functions that return a newly allocated string which
+ * ought to be freed with g_free from the caller at some point.
+ */
+gchar*  g_strdup               (const gchar *str);
+gchar*  g_strdup_printf        (const gchar *format,
                                 ...) G_GNUC_PRINTF (1, 2);
-gchar* g_strdup_vprintf        (const gchar *format,
+gchar*  g_strdup_vprintf       (const gchar *format,
                                 va_list      args);
-gchar* g_strndup               (const gchar *str,
-                                guint        n);
-gchar*  g_strnfill             (guint        length,
+gchar*  g_strndup              (const gchar *str,
+                                guint        n);
+gchar*  g_strnfill             (guint        length,
                                 gchar        fill_char);
-gchar* g_strconcat             (const gchar *string1,
+gchar*  g_strconcat            (const gchar *string1,
                                 ...); /* NULL terminated */
-gdouble g_strtod               (const gchar *nptr,
-                                gchar      **endptr);
-gchar* g_strerror              (gint         errnum);
-gchar* g_strsignal             (gint         signum);
-gint   g_strcasecmp            (const gchar *s1,
-                                const gchar *s2);
-void   g_strdown               (gchar       *string);
-void   g_strup                 (gchar       *string);
-void   g_strreverse            (gchar       *string);
+gchar*   g_strjoin             (const gchar  *separator,
+                                ...); /* NULL terminated */
+/* Make a copy of a string interpreting C string -style escape
+ * sequences. Inverse of g_strescape. The recognized sequences are \b
+ * \f \n \r \t \\ \" and the octal format.
+ */
+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);
+
+gpointer g_memdup              (gconstpointer mem,
+                                guint         byte_size);
+
+/* NULL terminated string arrays.
+ * g_strsplit() splits up string into max_tokens tokens at delim and
+ * returns a newly allocated string array.
+ * g_strjoinv() concatenates all of str_array's strings, sliding in an
+ * optional separator, the returned string is newly allocated.
+ * g_strfreev() frees the array itself and all of its strings.
+ */
+gchar**         g_strsplit             (const gchar  *string,
+                                const gchar  *delimiter,
+                                gint          max_tokens);
+gchar*   g_strjoinv            (const gchar  *separator,
+                                gchar       **str_array);
+void     g_strfreev            (gchar       **str_array);
+
+
 
 /* calculate a string size, guarranteed to fit format + args.
  */
 guint  g_printf_string_upper_bound (const gchar* format,
-                                    va_list      args);
+                                    va_list      args);
 
 
 /* Retrive static string info
@@ -1190,39 +1765,61 @@ gint    g_vsnprintf             (gchar       *string,
                                 gulong       n,
                                 gchar const *format,
                                 va_list      args);
+/* 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);
+
+/* 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);
-
-/* strings are newly allocated with g_malloc() */
 gchar* g_dirname               (const gchar *file_name);
+
+/* The returned strings are newly allocated with g_malloc() */
 gchar* g_get_current_dir       (void);
+gchar* g_path_get_basename     (const gchar *file_name);
+gchar* g_path_get_dirname      (const gchar *file_name);
 
-/* We make the assumption that if memmove isn't available, then
- * bcopy will do the job. This isn't safe everywhere. (bcopy can't
- * necessarily handle overlapping copies).
- * Either way, g_memmove() will not return a value.
- */
-#ifdef HAVE_MEMMOVE
-#define g_memmove(dest, src, size)     G_STMT_START {  \
-     memmove ((dest), (src), (size));                  \
-} G_STMT_END
-#else
-#define g_memmove(dest, src, size)     G_STMT_START {  \
-     bcopy ((src), (dest), (size));                    \
-} G_STMT_END
-#endif
+/* 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
+ * (if there is any in the implementation) and doesn't encounter
+ * missing include files.
+ */
+void   g_atexit                (GVoidFunc    func);
 
 
 /* Bit tests
  */
+G_INLINE_FUNC gint     g_bit_nth_lsf (guint32 mask,
+                                      gint    nth_bit);
+G_INLINE_FUNC gint     g_bit_nth_msf (guint32 mask,
+                                      gint    nth_bit);
+G_INLINE_FUNC guint    g_bit_storage (guint number);
 
-/* Prototypes are required for inline functions to pacify gcc when
- * some warnings are enabled.  */
-gint g_bit_nth_lsf (guint32 mask, gint nth_bit);
-gint g_bit_nth_msf (guint32 mask, gint nth_bit);
-guint g_bit_storage (guint number);
 
-GLIB_INLINE gint
+/* Trash Stacks
+ * elements need to be >= sizeof (gpointer)
+ */
+G_INLINE_FUNC void     g_trash_stack_push      (GTrashStack **stack_p,
+                                                gpointer      data_p);
+G_INLINE_FUNC gpointer g_trash_stack_pop       (GTrashStack **stack_p);
+G_INLINE_FUNC gpointer g_trash_stack_peek      (GTrashStack **stack_p);
+G_INLINE_FUNC guint    g_trash_stack_height    (GTrashStack **stack_p);
+
+
+/* inline function implementations
+ */
+#if defined (G_CAN_INLINE) || defined (__G_UTILS_C__)
+G_INLINE_FUNC gint
 g_bit_nth_lsf (guint32 mask,
               gint    nth_bit)
 {
@@ -1235,12 +1832,12 @@ g_bit_nth_lsf (guint32 mask,
   while (nth_bit < 32);
   return -1;
 }
-GLIB_INLINE gint
+G_INLINE_FUNC gint
 g_bit_nth_msf (guint32 mask,
               gint    nth_bit)
 {
   if (nth_bit < 0)
-    nth_bit = 33;
+    nth_bit = 32;
   do
     {
       nth_bit--;
@@ -1250,18 +1847,66 @@ g_bit_nth_msf (guint32 mask,
   while (nth_bit > 0);
   return -1;
 }
-GLIB_INLINE guint
+G_INLINE_FUNC guint
 g_bit_storage (guint number)
 {
   register guint n_bits = 0;
-
+  
   do
     {
       n_bits++;
-      number = number >> 1;
-    } while (number);
+      number >>= 1;
+    }
+  while (number);
   return n_bits;
 }
+G_INLINE_FUNC void
+g_trash_stack_push (GTrashStack **stack_p,
+                   gpointer      data_p)
+{
+  GTrashStack *data = (GTrashStack *) data_p;
+
+  data->next = *stack_p;
+  *stack_p = data;
+}
+G_INLINE_FUNC gpointer
+g_trash_stack_pop (GTrashStack **stack_p)
+{
+  GTrashStack *data;
+
+  data = *stack_p;
+  if (data)
+    {
+      *stack_p = data->next;
+      /* NULLify private pointer here, most platforms store NULL as
+       * subsequent 0 bytes
+       */
+      data->next = NULL;
+    }
+
+  return data;
+}
+G_INLINE_FUNC gpointer
+g_trash_stack_peek (GTrashStack **stack_p)
+{
+  GTrashStack *data;
+
+  data = *stack_p;
+
+  return data;
+}
+G_INLINE_FUNC guint
+g_trash_stack_height (GTrashStack **stack_p)
+{
+  GTrashStack *data;
+  guint i = 0;
+
+  for (data = *stack_p; data; data = data->next)
+    i++;
+
+  return i;
+}
+#endif  /* G_CAN_INLINE || __G_UTILS_C__ */
 
 
 /* String Chunks
@@ -1276,113 +1921,154 @@ gchar*              g_string_chunk_insert_const  (GStringChunk *chunk,
 
 /* Strings
  */
-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,
-                            const gchar *rval);
-GString* g_string_truncate  (GString    *string,
-                            gint         len);
-GString* g_string_append    (GString    *string,
-                            const gchar *val);
-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_insert    (GString    *string,
-                            gint         pos,
-                            const gchar *val);
-GString* g_string_insert_c  (GString    *string,
-                            gint         pos,
-                            gchar        c);
-GString* g_string_erase            (GString     *string,
-                            gint         pos,
-                            gint         len);
-GString* g_string_down     (GString     *string);
-GString* g_string_up       (GString     *string);
-void    g_string_sprintf   (GString     *string,
-                            const gchar *format,
-                            ...) G_GNUC_PRINTF (2, 3);
-void    g_string_sprintfa  (GString     *string,
-                            const gchar *format,
-                            ...) G_GNUC_PRINTF (2, 3);
-
-
-/* Resizable arrays
- */
-
-#define g_array_append_val(a,v) g_array_append_vals(a,&v,1)
-#define g_array_prepend_val(a,v) g_array_prepend_vals(a,&v,1)
-#define g_array_index(a,t,i) (((t*)a->data)[i])
-
-GArray* g_array_new         (gboolean      zero_terminated,
-                             gboolean      clear,
-                             guint         element_size);
-void   g_array_free         (GArray       *array,
-                             gboolean      free_segment);
-GArray* g_array_append_vals  (GArray       *array,
-                             gconstpointer data,
-                             guint         len);
-GArray* g_array_prepend_vals (GArray       *array,
-                             gconstpointer data,
-                             guint         len);
-GArray* g_array_set_size     (GArray       *array,
-                             guint         length);
+GString*     g_string_new              (const gchar     *init);
+GString*     g_string_sized_new         (guint           dfl_size);
+gchar*      g_string_free              (GString         *string,
+                                        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,
+                                        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);
+GString*     g_string_insert_c          (GString        *string,
+                                        gint             pos,
+                                        gchar            c);
+GString*     g_string_erase            (GString         *string,
+                                        gint             pos,
+                                        gint             len);
+GString*     g_string_down              (GString        *string);
+GString*     g_string_up                (GString        *string);
+void         g_string_sprintf           (GString        *string,
+                                        const gchar     *format,
+                                        ...) G_GNUC_PRINTF (2, 3);
+void         g_string_sprintfa          (GString        *string,
+                                        const gchar     *format,
+                                        ...) G_GNUC_PRINTF (2, 3);
+
+
+/* Resizable arrays, remove fills any cleared spot and shortens the
+ * array, while preserving the order. remove_fast will distort the
+ * order by moving the last element to the position of the removed 
+ */
+
+#define g_array_append_val(a,v)          g_array_append_vals (a, &v, 1)
+#define g_array_prepend_val(a,v)  g_array_prepend_vals (a, &v, 1)
+#define g_array_insert_val(a,i,v) g_array_insert_vals (a, i, &v, 1)
+#define g_array_index(a,t,i)      (((t*) (a)->data) [(i)])
+
+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);
+gchar*  g_array_free             (GArray          *array,
+                                  gboolean         free_segment);
+GArray* g_array_append_vals       (GArray         *array,
+                                  gconstpointer    data,
+                                  guint            len);
+GArray* g_array_prepend_vals      (GArray         *array,
+                                  gconstpointer    data,
+                                  guint            len);
+GArray* g_array_insert_vals       (GArray          *array,
+                                  guint            index,
+                                  gconstpointer    data,
+                                  guint            len);
+GArray* g_array_set_size          (GArray         *array,
+                                  guint            length);
+GArray* g_array_remove_index     (GArray          *array,
+                                  guint            index);
+GArray* g_array_remove_index_fast (GArray         *array,
+                                  guint            index);
 
 /* Resizable pointer array.  This interface is much less complicated
  * than the above.  Add appends appends a pointer.  Remove fills any
- * cleared spot and shortens the array.
+ * cleared spot and shortens the array. remove_fast will again distort
+ * order.  
  */
 #define            g_ptr_array_index(array,index) (array->pdata)[index]
 GPtrArray*  g_ptr_array_new               (void);
-void       g_ptr_array_free               (GPtrArray   *array,
+GPtrArray*  g_ptr_array_sized_new         (guint        reserved_size);
+gpointer*   g_ptr_array_free              (GPtrArray   *array,
                                            gboolean     free_seg);
 void       g_ptr_array_set_size           (GPtrArray   *array,
                                            gint         length);
-gpointer    g_ptr_array_remove_index       (GPtrArray   *array,
-                                           gint         index);
-gboolean    g_ptr_array_remove             (GPtrArray   *array,
-                                           gpointer     data);
-void        g_ptr_array_add                (GPtrArray   *array,
-                                           gpointer     data);
+gpointer    g_ptr_array_remove_index      (GPtrArray   *array,
+                                           guint        index);
+gpointer    g_ptr_array_remove_index_fast  (GPtrArray  *array,
+                                           guint        index);
+gboolean    g_ptr_array_remove            (GPtrArray   *array,
+                                           gpointer     data);
+gboolean    g_ptr_array_remove_fast        (GPtrArray  *array,
+                                           gpointer     data);
+void       g_ptr_array_add                (GPtrArray   *array,
+                                           gpointer     data);
 
 /* Byte arrays, an array of guint8.  Implemented as a GArray,
  * but type-safe.
  */
 
-GByteArray* g_byte_array_new      (void);
-void       g_byte_array_free     (GByteArray   *array,
-                                  gboolean      free_segment);
-GByteArray* g_byte_array_append   (GByteArray   *array,
-                                  const guint8 *data,
-                                  guint         len);
-GByteArray* g_byte_array_prepend  (GByteArray   *array,
-                                  const guint8 *data,
-                                  guint         len);
-GByteArray* g_byte_array_set_size (GByteArray   *array,
-                                  guint         length);
+GByteArray* g_byte_array_new              (void);
+GByteArray* g_byte_array_sized_new        (guint        reserved_size);
+guint8*            g_byte_array_free              (GByteArray   *array,
+                                           gboolean      free_segment);
+GByteArray* g_byte_array_append                   (GByteArray   *array,
+                                           const guint8 *data,
+                                           guint         len);
+GByteArray* g_byte_array_prepend           (GByteArray  *array,
+                                           const guint8 *data,
+                                           guint         len);
+GByteArray* g_byte_array_set_size          (GByteArray  *array,
+                                           guint         length);
+GByteArray* g_byte_array_remove_index     (GByteArray   *array,
+                                           guint         index);
+GByteArray* g_byte_array_remove_index_fast (GByteArray  *array,
+                                           guint         index);
 
 
 /* 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) G_GNUC_CONST;
+guint   g_int_hash  (gconstpointer   v) G_GNUC_CONST;
 
 /* This "hash" function will just return the key's adress as an
  * unsigned integer. Useful for hashing on plain adresses or
  * simple integer values.
+ * passing NULL into g_hash_table_new() as GHashFunc has the
+ * same effect as passing g_direct_hash().
  */
-guint g_direct_hash  (gconstpointer v);
+guint g_direct_hash  (gconstpointer v) G_GNUC_CONST;
 gint  g_direct_equal (gconstpointer v,
-                     gconstpointer v2);
+                     gconstpointer v2) G_GNUC_CONST;
 
 
 /* Quarks (string<->id association)
@@ -1390,21 +2076,54 @@ gint  g_direct_equal (gconstpointer v,
 GQuark   g_quark_try_string            (const gchar    *string);
 GQuark   g_quark_from_static_string    (const gchar    *string);
 GQuark   g_quark_from_string           (const gchar    *string);
-gchar*   g_quark_to_string             (GQuark          quark);
+gchar*   g_quark_to_string             (GQuark          quark) G_GNUC_CONST;
 
 
-/* Location Associated Data
+/* Keyed Data List
+ */
+void     g_datalist_init                (GData          **datalist);
+void     g_datalist_clear               (GData          **datalist);
+gpointer  g_datalist_id_get_data        (GData          **datalist,
+                                         GQuark           key_id);
+void     g_datalist_id_set_data_full    (GData          **datalist,
+                                         GQuark           key_id,
+                                         gpointer         data,
+                                         GDestroyNotify   destroy_func);
+gpointer  g_datalist_id_remove_no_notify (GData                 **datalist,
+                                         GQuark           key_id);
+void     g_datalist_foreach             (GData          **datalist,
+                                         GDataForeachFunc func,
+                                         gpointer         user_data);
+#define          g_datalist_id_set_data(dl, q, d)      \
+     g_datalist_id_set_data_full ((dl), (q), (d), NULL)
+#define          g_datalist_id_remove_data(dl, q)      \
+     g_datalist_id_set_data ((dl), (q), NULL)
+#define          g_datalist_get_data(dl, k)            \
+     (g_datalist_id_get_data ((dl), g_quark_try_string (k)))
+#define          g_datalist_set_data_full(dl, k, d, f) \
+     g_datalist_id_set_data_full ((dl), g_quark_from_string (k), (d), (f))
+#define          g_datalist_remove_no_notify(dl, k)    \
+     g_datalist_id_remove_no_notify ((dl), g_quark_try_string (k))
+#define          g_datalist_set_data(dl, k, d)         \
+     g_datalist_set_data_full ((dl), (k), (d), NULL)
+#define          g_datalist_remove_data(dl, k)         \
+     g_datalist_id_set_data ((dl), g_quark_try_string (k), NULL)
+
+
+/* Location Associated Keyed Data
  */
-void     g_dataset_destroy             (gconstpointer   dataset_location);
-gpointer  g_dataset_id_get_data                (gconstpointer   dataset_location,
-                                        GQuark          key_id);
-void     g_dataset_id_set_data_full    (gconstpointer   dataset_location,
-                                        GQuark          key_id,
-                                        gpointer        data,
-                                        GDestroyNotify  destroy_func);
-void     g_dataset_id_set_destroy      (gconstpointer   dataset_location,
-                                        GQuark          key_id,
-                                        GDestroyNotify  destroy_func);
+void     g_dataset_destroy             (gconstpointer    dataset_location);
+gpointer  g_dataset_id_get_data                (gconstpointer    dataset_location,
+                                        GQuark           key_id);
+void     g_dataset_id_set_data_full    (gconstpointer    dataset_location,
+                                        GQuark           key_id,
+                                        gpointer         data,
+                                        GDestroyNotify   destroy_func);
+gpointer  g_dataset_id_remove_no_notify        (gconstpointer    dataset_location,
+                                        GQuark           key_id);
+void     g_dataset_foreach             (gconstpointer    dataset_location,
+                                        GDataForeachFunc func,
+                                        gpointer         user_data);
 #define          g_dataset_id_set_data(l, k, d)        \
      g_dataset_id_set_data_full ((l), (k), (d), NULL)
 #define          g_dataset_id_remove_data(l, k)        \
@@ -1413,12 +2132,12 @@ void      g_dataset_id_set_destroy      (gconstpointer   dataset_location,
      (g_dataset_id_get_data ((l), g_quark_try_string (k)))
 #define          g_dataset_set_data_full(l, k, d, f)   \
      g_dataset_id_set_data_full ((l), g_quark_from_string (k), (d), (f))
-#define          g_dataset_set_destroy(l, k, f)        \
-     g_dataset_id_set_destroy ((l), g_quark_from_string (k), (f))
+#define          g_dataset_remove_no_notify(l, k)      \
+     g_dataset_id_remove_no_notify ((l), g_quark_try_string (k))
 #define          g_dataset_set_data(l, k, d)           \
      g_dataset_set_data_full ((l), (k), (d), NULL)
-#define          g_dataset_remove_data(l,k)            \
-     g_dataset_set_data ((l), (k), NULL)
+#define          g_dataset_remove_data(l, k)           \
+     g_dataset_id_set_data ((l), g_quark_try_string (k), NULL)
 
 
 /* GScanner: Flexible lexical scanner for general purpose.
@@ -1427,6 +2146,7 @@ void        g_dataset_id_set_destroy      (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"\
@@ -1453,7 +2173,7 @@ typedef enum
 typedef enum
 {
   G_TOKEN_EOF                  =   0,
-
+  
   G_TOKEN_LEFT_PAREN           = '(',
   G_TOKEN_RIGHT_PAREN          = ')',
   G_TOKEN_LEFT_CURLY           = '{',
@@ -1462,11 +2182,11 @@ typedef enum
   G_TOKEN_RIGHT_BRACE          = ']',
   G_TOKEN_EQUAL_SIGN           = '=',
   G_TOKEN_COMMA                        = ',',
-
+  
   G_TOKEN_NONE                 = 256,
-
+  
   G_TOKEN_ERROR,
-
+  
   G_TOKEN_CHAR,
   G_TOKEN_BINARY,
   G_TOKEN_OCTAL,
@@ -1474,17 +2194,17 @@ typedef enum
   G_TOKEN_HEX,
   G_TOKEN_FLOAT,
   G_TOKEN_STRING,
-
+  
   G_TOKEN_SYMBOL,
   G_TOKEN_IDENTIFIER,
   G_TOKEN_IDENTIFIER_NULL,
-
+  
   G_TOKEN_COMMENT_SINGLE,
   G_TOKEN_COMMENT_MULTI,
   G_TOKEN_LAST
 } GTokenType;
 
-union  _GValue
+union  _GTokenValue
 {
   gpointer     v_symbol;
   gchar                *v_identifier;
@@ -1507,11 +2227,11 @@ struct  _GScannerConfig
   gchar                *cset_identifier_first;
   gchar                *cset_identifier_nth;
   gchar                *cpair_comment_single;          /* default: "#\n" */
-
+  
   /* Should symbol lookup work case sensitive?
    */
   guint                case_sensitive : 1;
-
+  
   /* Boolean values to be adjusted "on the fly"
    * to configure scanning behaviour.
    */
@@ -1542,39 +2262,39 @@ struct  _GScanner
   /* unused fields */
   gpointer             user_data;
   guint                        max_parse_errors;
-
+  
   /* g_scanner_error() increments this field */
   guint                        parse_errors;
-
+  
   /* name of input stream, featured by the default message handler */
   const gchar          *input_name;
-
+  
   /* data pointer for derived structures */
   gpointer             derived_data;
-
+  
   /* link into the scanner configuration */
   GScannerConfig       *config;
-
+  
   /* fields filled in after g_scanner_get_next_token() */
   GTokenType           token;
-  GValue               value;
+  GTokenValue          value;
   guint                        line;
   guint                        position;
-
+  
   /* fields filled in after g_scanner_peek_next_token() */
   GTokenType           next_token;
-  GValue               next_value;
+  GTokenValue          next_value;
   guint                        next_line;
   guint                        next_position;
-
+  
   /* to be considered private */
   GHashTable           *symbol_table;
-  const gchar          *text;
-  guint                        text_len;
   gint                 input_fd;
-  gint                 peeked_char;
+  const gchar          *text;
+  const gchar          *text_end;
+  gchar                        *buffer;
   guint                        scope_id;
-
+  
   /* handler function for _warn and _error */
   GScannerMsgFunc      msg_handler;
 };
@@ -1583,13 +2303,14 @@ GScanner*       g_scanner_new                   (GScannerConfig *config_templ);
 void           g_scanner_destroy               (GScanner       *scanner);
 void           g_scanner_input_file            (GScanner       *scanner,
                                                 gint           input_fd);
+void           g_scanner_sync_file_offset      (GScanner       *scanner);
 void           g_scanner_input_text            (GScanner       *scanner,
                                                 const  gchar   *text,
                                                 guint          text_len);
 GTokenType     g_scanner_get_next_token        (GScanner       *scanner);
 GTokenType     g_scanner_peek_next_token       (GScanner       *scanner);
 GTokenType     g_scanner_cur_token             (GScanner       *scanner);
-GValue         g_scanner_cur_value             (GScanner       *scanner);
+GTokenValue    g_scanner_cur_value             (GScanner       *scanner);
 guint          g_scanner_cur_line              (GScanner       *scanner);
 guint          g_scanner_cur_position          (GScanner       *scanner);
 gboolean       g_scanner_eof                   (GScanner       *scanner);
@@ -1608,11 +2329,9 @@ gpointer g_scanner_scope_lookup_symbol   (GScanner       *scanner,
 void           g_scanner_scope_foreach_symbol  (GScanner       *scanner,
                                                 guint           scope_id,
                                                 GHFunc          func,
-                                                gpointer        func_data);
+                                                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,
@@ -1638,14 +2357,19 @@ 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);
 
-/* Completion */
+/* GCompletion
+ */
 
 struct _GCompletion
 {
   GList* items;
   GCompletionFunc func;
-
+  
   gchar* prefix;
   GList* cache;
 };
@@ -1662,7 +2386,197 @@ GList*       g_completion_complete     (GCompletion*    cmp,
 void        g_completion_free         (GCompletion*    cmp);
 
 
-/* GRelation: Indexed Relations.  Imagine a really simple table in a
+/* GDate
+ *
+ * Date calculations (not time for now, to be resolved). These are a
+ * mutant combination of Steffen Beyer's DateCalc routines
+ * (http://www.perl.com/CPAN/authors/id/STBEY/) and Jon Trowbridge's
+ * date routines (written for in-house software).  Written by Havoc
+ * Pennington <hp@pobox.com> 
+ */
+
+typedef guint16 GDateYear;
+typedef guint8  GDateDay;   /* day of the month */
+typedef struct _GDate GDate;
+/* make struct tm known without having to include time.h */
+struct tm;
+
+/* enum used to specify order of appearance in parsed date strings */
+typedef enum
+{
+  G_DATE_DAY   = 0,
+  G_DATE_MONTH = 1,
+  G_DATE_YEAR  = 2
+} GDateDMY;
+
+/* actual week and month values */
+typedef enum
+{
+  G_DATE_BAD_WEEKDAY  = 0,
+  G_DATE_MONDAY       = 1,
+  G_DATE_TUESDAY      = 2,
+  G_DATE_WEDNESDAY    = 3,
+  G_DATE_THURSDAY     = 4,
+  G_DATE_FRIDAY       = 5,
+  G_DATE_SATURDAY     = 6,
+  G_DATE_SUNDAY       = 7
+} GDateWeekday;
+typedef enum
+{
+  G_DATE_BAD_MONTH = 0,
+  G_DATE_JANUARY   = 1,
+  G_DATE_FEBRUARY  = 2,
+  G_DATE_MARCH     = 3,
+  G_DATE_APRIL     = 4,
+  G_DATE_MAY       = 5,
+  G_DATE_JUNE      = 6,
+  G_DATE_JULY      = 7,
+  G_DATE_AUGUST    = 8,
+  G_DATE_SEPTEMBER = 9,
+  G_DATE_OCTOBER   = 10,
+  G_DATE_NOVEMBER  = 11,
+  G_DATE_DECEMBER  = 12
+} GDateMonth;
+
+#define G_DATE_BAD_JULIAN 0U
+#define G_DATE_BAD_DAY    0U
+#define G_DATE_BAD_YEAR   0U
+
+/* Note: directly manipulating structs is generally a bad idea, but
+ * in this case it's an *incredibly* bad idea, because all or part
+ * of this struct can be invalid at any given time. Use the functions,
+ * or you will get hosed, I promise.
+ */
+struct _GDate
+{ 
+  guint julian_days : 32; /* julian days representation - we use a
+                           *  bitfield hoping that 64 bit platforms
+                           *  will pack this whole struct in one big
+                           *  int 
+                           */
+
+  guint julian : 1;    /* julian is valid */
+  guint dmy    : 1;    /* dmy is valid */
+
+  /* DMY representation */
+  guint day    : 6;  
+  guint month  : 4; 
+  guint year   : 16; 
+};
+
+/* g_date_new() returns an invalid date, you then have to _set() stuff 
+ * to get a usable object. You can also allocate a GDate statically,
+ * then call g_date_clear() to initialize.
+ */
+GDate*       g_date_new                   (void);
+GDate*       g_date_new_dmy               (GDateDay     day, 
+                                           GDateMonth   month, 
+                                           GDateYear    year);
+GDate*       g_date_new_julian            (guint32      julian_day);
+void         g_date_free                  (GDate       *date);
+
+/* check g_date_valid() after doing an operation that might fail, like
+ * _parse.  Almost all g_date operations are undefined on invalid
+ * dates (the exceptions are the mutators, since you need those to
+ * return to validity).  
+ */
+gboolean     g_date_valid                 (GDate       *date);
+gboolean     g_date_valid_day             (GDateDay     day);
+gboolean     g_date_valid_month           (GDateMonth   month);
+gboolean     g_date_valid_year            (GDateYear    year);
+gboolean     g_date_valid_weekday         (GDateWeekday weekday);
+gboolean     g_date_valid_julian          (guint32      julian_date);
+gboolean     g_date_valid_dmy             (GDateDay     day,
+                                           GDateMonth   month,
+                                           GDateYear    year);
+
+GDateWeekday g_date_weekday               (GDate       *date);
+GDateMonth   g_date_month                 (GDate       *date);
+GDateYear    g_date_year                  (GDate       *date);
+GDateDay     g_date_day                   (GDate       *date);
+guint32      g_date_julian                (GDate       *date);
+guint        g_date_day_of_year           (GDate       *date);
+
+/* First monday/sunday is the start of week 1; if we haven't reached
+ * that day, return 0. These are not ISO weeks of the year; that
+ * routine needs to be added.
+ * these functions return the number of weeks, starting on the
+ * corrsponding day
+ */
+guint        g_date_monday_week_of_year   (GDate      *date);
+guint        g_date_sunday_week_of_year   (GDate      *date);
+
+/* If you create a static date struct you need to clear it to get it
+ * in a sane state before use. You can clear a whole array at
+ * once with the ndates argument.
+ */
+void         g_date_clear                 (GDate       *date, 
+                                           guint        n_dates);
+
+/* The parse routine is meant for dates typed in by a user, so it
+ * permits many formats but tries to catch common typos. If your data
+ * needs to be strictly validated, it is not an appropriate function.
+ */
+void         g_date_set_parse             (GDate       *date,
+                                           const gchar *str);
+void         g_date_set_time              (GDate       *date, 
+                                           GTime        time);
+void         g_date_set_month             (GDate       *date, 
+                                           GDateMonth   month);
+void         g_date_set_day               (GDate       *date, 
+                                           GDateDay     day);
+void         g_date_set_year              (GDate       *date,
+                                           GDateYear    year);
+void         g_date_set_dmy               (GDate       *date,
+                                           GDateDay     day,
+                                           GDateMonth   month,
+                                           GDateYear    y);
+void         g_date_set_julian            (GDate       *date,
+                                           guint32      julian_date);
+gboolean     g_date_is_first_of_month     (GDate       *date);
+gboolean     g_date_is_last_of_month      (GDate       *date);
+
+/* To go forward by some number of weeks just go forward weeks*7 days */
+void         g_date_add_days              (GDate       *date, 
+                                           guint        n_days);
+void         g_date_subtract_days         (GDate       *date, 
+                                           guint        n_days);
+
+/* If you add/sub months while day > 28, the day might change */
+void         g_date_add_months            (GDate       *date,
+                                           guint        n_months);
+void         g_date_subtract_months       (GDate       *date,
+                                           guint        n_months);
+
+/* If it's feb 29, changing years can move you to the 28th */
+void         g_date_add_years             (GDate       *date,
+                                           guint        n_years);
+void         g_date_subtract_years        (GDate       *date,
+                                           guint        n_years);
+gboolean     g_date_is_leap_year          (GDateYear    year) G_GNUC_CONST;
+guint8       g_date_days_in_month         (GDateMonth   month, 
+                                           GDateYear    year) G_GNUC_CONST;
+guint8       g_date_monday_weeks_in_year  (GDateYear    year) G_GNUC_CONST;
+guint8       g_date_sunday_weeks_in_year  (GDateYear    year) G_GNUC_CONST;
+
+/* qsort-friendly (with a cast...) */
+gint         g_date_compare               (GDate       *lhs,
+                                           GDate       *rhs);
+void         g_date_to_struct_tm          (GDate       *date,
+                                           struct tm   *tm);
+
+/* Just like strftime() except you can only use date-related formats.
+ *   Using a time format is undefined.
+ */
+gsize        g_date_strftime              (gchar       *s,
+                                           gsize        slen,
+                                           const gchar *format,
+                                           GDate       *date);
+
+
+/* GRelation
+ *
+ * Indexed Relations.  Imagine a really simple table in a
  * database.  Relations are not ordered.  This data type is meant for
  * maintaining a N-way mapping.
  *
@@ -1710,27 +2624,815 @@ gpointer   g_tuples_index     (GTuples    *tuples,
                               gint         field);
 
 
+/* GRand - a good and fast random number generator: Mersenne Twister 
+ * see http://www.math.keio.ac.jp/~matumoto/emt.html for more info.
+ * The range functions return a value in the intervall [min,max).
+ * int          -> [0..2^32-1]
+ * int_range    -> [min..max-1]
+ * double       -> [0..1)
+ * double_range -> [min..max)
+ */
+
+GRand*  g_rand_new_with_seed   (guint32     seed);
+GRand*  g_rand_new             (void);
+void    g_rand_free            (GRand      *rand);
+
+void    g_rand_set_seed        (GRand      *rand, 
+                               guint32     seed);
+guint32 g_rand_int             (GRand      *rand);
+gint32  g_rand_int_range       (GRand      *rand, 
+                               gint32      min, 
+                               gint32      max);
+gdouble g_rand_double          (GRand      *rand);
+gdouble g_rand_double_range    (GRand      *rand, 
+                               gdouble     min, 
+                               gdouble     max);
+
+void    g_random_set_seed      (guint32     seed);
+guint32 g_random_int           (void);
+gint32  g_random_int_range     (gint32      min, 
+                               gint32      max);
+gdouble g_random_double        (void);
+gdouble g_random_double_range  (gdouble     min, 
+                               gdouble     max);
+
 /* Prime numbers.
  */
 
 /* This function returns prime numbers spaced by approximately 1.5-2.0
  * and is for use in resizing data structures which prefer
- * prime-valued sizes.  The closest spaced prime function returns the
+ * prime-valued sizes. The closest spaced prime function returns the
  * next largest prime, or the highest it knows about which is about
  * MAXINT/4.
  */
+guint     g_spaced_primes_closest (guint num) G_GNUC_CONST;
 
-guint      g_spaced_primes_closest (guint num);
 
-/* Glib version.
+/* GIOChannel
+ */
+
+typedef struct _GIOFuncs GIOFuncs;
+typedef enum
+{
+  G_IO_ERROR_NONE,
+  G_IO_ERROR_AGAIN,
+  G_IO_ERROR_INVAL,
+  G_IO_ERROR_UNKNOWN
+} GIOError;
+typedef enum
+{
+  G_SEEK_CUR,
+  G_SEEK_SET,
+  G_SEEK_END
+} GSeekType;
+typedef enum
+{
+  G_IO_IN      GLIB_SYSDEF_POLLIN,
+  G_IO_OUT     GLIB_SYSDEF_POLLOUT,
+  G_IO_PRI     GLIB_SYSDEF_POLLPRI,
+  G_IO_ERR     GLIB_SYSDEF_POLLERR,
+  G_IO_HUP     GLIB_SYSDEF_POLLHUP,
+  G_IO_NVAL    GLIB_SYSDEF_POLLNVAL
+} GIOCondition;
+
+struct _GIOChannel
+{
+  guint channel_flags;
+  guint ref_count;
+  GIOFuncs *funcs;
+};
+
+typedef gboolean (*GIOFunc) (GIOChannel   *source,
+                            GIOCondition  condition,
+                            gpointer      data);
+struct _GIOFuncs
+{
+  GIOError (*io_read)   (GIOChannel    *channel, 
+                        gchar          *buf, 
+                        guint           count,
+                        guint          *bytes_read);
+  GIOError (*io_write)  (GIOChannel    *channel, 
+                        gchar          *buf, 
+                        guint           count,
+                        guint          *bytes_written);
+  GIOError (*io_seek)   (GIOChannel    *channel, 
+                        gint            offset, 
+                        GSeekType       type);
+  void (*io_close)      (GIOChannel    *channel);
+  guint (*io_add_watch) (GIOChannel     *channel,
+                        gint            priority,
+                        GIOCondition    condition,
+                        GIOFunc         func,
+                        gpointer        user_data,
+                        GDestroyNotify  notify);
+  void (*io_free)       (GIOChannel    *channel);
+};
+
+void        g_io_channel_init   (GIOChannel    *channel);
+void        g_io_channel_ref    (GIOChannel    *channel);
+void        g_io_channel_unref  (GIOChannel    *channel);
+GIOError    g_io_channel_read   (GIOChannel    *channel, 
+                                gchar         *buf, 
+                                guint          count,
+                                guint         *bytes_read);
+GIOError  g_io_channel_write    (GIOChannel    *channel, 
+                                gchar         *buf, 
+                                guint          count,
+                                guint         *bytes_written);
+GIOError  g_io_channel_seek     (GIOChannel    *channel,
+                                gint           offset, 
+                                GSeekType      type);
+void      g_io_channel_close    (GIOChannel    *channel);
+guint     g_io_add_watch_full   (GIOChannel    *channel,
+                                gint           priority,
+                                GIOCondition   condition,
+                                GIOFunc        func,
+                                gpointer       user_data,
+                                GDestroyNotify notify);
+guint    g_io_add_watch         (GIOChannel    *channel,
+                                GIOCondition   condition,
+                                GIOFunc        func,
+                                gpointer       user_data);
+
+
+/* Main loop
+ */
+typedef struct _GTimeVal       GTimeVal;
+typedef struct _GSourceFuncs   GSourceFuncs;
+typedef struct _GMainLoop      GMainLoop;      /* Opaque */
+
+struct _GTimeVal
+{
+  glong tv_sec;
+  glong tv_usec;
+};
+struct _GSourceFuncs
+{
+  gboolean (*prepare)  (gpointer  source_data, 
+                       GTimeVal *current_time,
+                       gint     *timeout,
+                       gpointer  user_data);
+  gboolean (*check)    (gpointer  source_data,
+                       GTimeVal *current_time,
+                       gpointer  user_data);
+  gboolean (*dispatch) (gpointer  source_data, 
+                       GTimeVal *dispatch_time,
+                       gpointer  user_data);
+  GDestroyNotify destroy;
+};
+
+/* Standard priorities */
+
+#define G_PRIORITY_HIGH            -100
+#define G_PRIORITY_DEFAULT          0
+#define G_PRIORITY_HIGH_IDLE        100
+#define G_PRIORITY_DEFAULT_IDLE     200
+#define G_PRIORITY_LOW             300
+
+typedef gboolean (*GSourceFunc) (gpointer data);
+
+/* Hooks for adding to the main loop */
+guint    g_source_add                        (gint           priority, 
+                                             gboolean       can_recurse,
+                                             GSourceFuncs  *funcs,
+                                             gpointer       source_data, 
+                                             gpointer       user_data,
+                                             GDestroyNotify notify);
+gboolean g_source_remove                     (guint          tag);
+gboolean g_source_remove_by_user_data        (gpointer       user_data);
+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);
+
+/* Running the main loop */
+GMainLoop*     g_main_new              (gboolean        is_running);
+void           g_main_run              (GMainLoop      *loop);
+void           g_main_quit             (GMainLoop      *loop);
+void           g_main_destroy          (GMainLoop      *loop);
+gboolean       g_main_is_running       (GMainLoop      *loop);
+
+/* Run a single iteration of the mainloop. If block is FALSE,
+ * will never block
+ */
+gboolean       g_main_iteration        (gboolean       may_block);
+
+/* See if any events are pending */
+gboolean       g_main_pending          (void);
+
+/* Idles and timeouts */
+guint          g_timeout_add_full      (gint           priority,
+                                        guint          interval, 
+                                        GSourceFunc    function,
+                                        gpointer       data,
+                                        GDestroyNotify notify);
+guint          g_timeout_add           (guint          interval,
+                                        GSourceFunc    function,
+                                        gpointer       data);
+guint          g_idle_add              (GSourceFunc    function,
+                                        gpointer       data);
+guint          g_idle_add_full         (gint           priority,
+                                        GSourceFunc    function,
+                                        gpointer       data,
+                                        GDestroyNotify destroy);
+gboolean       g_idle_remove_by_data   (gpointer       data);
+
+/* GPollFD
+ *
+ * System-specific IO and main loop calls
+ *
+ * On Win32, the fd in a GPollFD should be Win32 HANDLE (*not* a file
+ * descriptor as provided by the C runtime) that can be used by
+ * MsgWaitForMultipleObjects. This does *not* include file handles
+ * from CreateFile, SOCKETs, nor pipe handles. (But you can use
+ * WSAEventSelect to signal events when a SOCKET is readable).
+ *
+ * On Win32, fd can also be the special value G_WIN32_MSG_HANDLE to
+ * indicate polling for messages. These message queue GPollFDs should
+ * be added with the g_main_poll_win32_msg_add function.
+ *
+ * But note that G_WIN32_MSG_HANDLE GPollFDs should not be used by GDK
+ * (GTK) programs, as GDK itself wants to read messages and convert them
+ * to GDK events.
+ *
+ * So, unless you really know what you are doing, it's best not to try
+ * to use the main loop polling stuff for your own needs on
+ * Win32. It's really only written for the GIMP's needs so
+ * far.
+ */
+
+typedef struct _GPollFD GPollFD;
+typedef gint   (*GPollFunc)    (GPollFD *ufds,
+                                guint    nfsd,
+                                gint     timeout);
+struct _GPollFD
+{
+  gint         fd;
+  gushort      events;
+  gushort      revents;
+};
+
+void        g_main_add_poll          (GPollFD    *fd,
+                                     gint        priority);
+void        g_main_remove_poll       (GPollFD    *fd);
+void        g_main_set_poll_func     (GPollFunc   func);
+
+#ifdef G_OS_WIN32
+
+/* Useful on other platforms, too? */
+
+GPollFunc   g_main_win32_get_poll_func (void);
+
+#endif
+
+/* On Unix, IO channels created with this function for any file
+ * descriptor or socket.
+ *
+ * On Win32, use this only for files opened with the MSVCRT (the
+ * Microsoft run-time C library) _open() or _pipe, including file
+ * descriptors 0, 1 and 2 (corresponding to stdin, stdout and stderr).
+ *
+ * The term file descriptor as used in the context of Win32 refers to
+ * the emulated Unix-like file descriptors MSVCRT provides. The native
+ * corresponding concept is file HANDLE. There isn't as of yet a way to
+ * get GIOChannels for file HANDLEs.
+ */
+GIOChannel* g_io_channel_unix_new    (int         fd);
+gint        g_io_channel_unix_get_fd (GIOChannel *channel);
+
+#ifdef G_OS_WIN32
+
+#define G_WIN32_MSG_HANDLE 19981206
+
+/* Use this to get a GPollFD from a GIOChannel, so that you can call
+ * g_io_channel_win32_poll(). After calling this you should only use
+ * g_io_channel_read() to read from the GIOChannel, i.e. never read()
+ * or recv() from the underlying file descriptor or SOCKET.
+ */
+void        g_io_channel_win32_make_pollfd (GIOChannel   *channel,
+                                           GIOCondition  condition,
+                                           GPollFD      *fd);
+
+/* This can be used to wait a until at least one of the channels is readable.
+ * On Unix you would do a select() on the file descriptors of the channels.
+ * This should probably be available for all platforms?
+ */
+gint        g_io_channel_win32_poll   (GPollFD    *fds,
+                                      gint        n_fds,
+                                      gint        timeout);
+
+/* This is used to add polling for Windows messages. GDK (GTk+) programs
+ * should *not* use this.
+ */
+void        g_main_poll_win32_msg_add (gint        priority,
+                                      GPollFD    *fd,
+                                      guint       hwnd);
+
+/* An IO channel for Windows messages for window handle hwnd. */
+GIOChannel *g_io_channel_win32_new_messages (guint hwnd);
+
+/* An IO channel for C runtime (emulated Unix-like) file
+ * descriptors. Identical to g_io_channel_unix_new above.
+ * After calling g_io_add_watch() on a IO channel returned
+ * by this function, you shouldn't call read() on the file
+ * descriptor.
+ */
+GIOChannel* g_io_channel_win32_new_fd (int         fd);
+
+/* Get the C runtime file descriptor of a channel. */
+gint        g_io_channel_win32_get_fd (GIOChannel *channel);
+
+/* An IO channel for a SOCK_STREAM winsock socket. The parameter
+ * should be a SOCKET. After calling g_io_add_watch() on a IO channel
+ * returned by this function, you shouldn't call recv() on the SOCKET.
+ */
+GIOChannel *g_io_channel_win32_new_stream_socket (int socket);
+
+#endif
+
+/* Windows emulation stubs for common Unix functions
+ */
+#ifdef G_OS_WIN32
+#  define MAXPATHLEN 1024
+
+#ifdef _MSC_VER
+typedef int pid_t;
+#endif
+
+/*
+ * To get prototypes for the following POSIXish functions, you have to
+ * include the indicated non-POSIX headers. The functions are defined
+ * in OLDNAMES.LIB (MSVC) or -lmoldname-msvc (mingw32).
+ *
+ * getcwd: <direct.h> (MSVC), <io.h> (mingw32)
+ * getpid: <process.h>
+ * access: <io.h>
+ * unlink: <stdio.h> or <io.h>
+ * open, read, write, lseek, close: <io.h>
+ * rmdir: <direct.h>
+ * pipe: <direct.h>
+ */
+
+/* pipe is not in OLDNAMES.LIB or -lmoldname-msvc. */
+#define pipe(phandles) _pipe (phandles, 4096, _O_BINARY)
+
+/* For some POSIX functions that are not provided by the MS runtime,
+ * we provide emulators in glib, which are prefixed with g_win32_.
+ */
+#    define ftruncate(fd, size)        g_win32_ftruncate (fd, size)
+
+/* -lmingw32 also has emulations for these, but we need our own
+ * for MSVC anyhow, so we might aswell use them always.
+ */
+#    define opendir            g_win32_opendir
+#    define readdir            g_win32_readdir
+#    define rewinddir          g_win32_rewinddir
+#    define closedir           g_win32_closedir
+#    define NAME_MAX 255
+
+struct DIR
+{
+  gchar    *dir_name;
+  gboolean  just_opened;
+  guint     find_file_handle;
+  gpointer  find_file_data;
+};
+typedef struct DIR DIR;
+struct dirent
+{
+  gchar  d_name[NAME_MAX + 1];
+};
+/* emulation functions */
+extern int     g_win32_ftruncate       (gint            f,
+                                        guint           size);
+DIR*           g_win32_opendir         (const gchar    *dirname);
+struct dirent* g_win32_readdir         (DIR            *dir);
+void           g_win32_rewinddir       (DIR            *dir);
+gint           g_win32_closedir        (DIR            *dir);
+
+/* The MS setlocale uses locale names of the form "English_United
+ * States.1252" etc. We want the Unixish standard form "en", "zh_TW"
+ * etc. This function gets the current thread locale from Windows and
+ * returns it as a string of the above form for use in forming file
+ * names etc. The returned string should be deallocated with g_free().
+ */
+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 */
+
+
+/* GLib Thread support
+ */
+
+extern GQuark g_thread_error_quark();
+#define G_THREAD_ERROR g_thread_error_quark()
+
+typedef enum
+{
+  G_THREAD_ERROR_AGAIN /* Resource temporarily unavailable */
+} GThreadError;
+
+typedef void           (*GThreadFunc)          (gpointer       value);
+
+typedef enum
+{
+    G_THREAD_PRIORITY_LOW,
+    G_THREAD_PRIORITY_NORMAL,
+    G_THREAD_PRIORITY_HIGH,
+    G_THREAD_PRIORITY_URGENT
+} GThreadPriority;
+
+typedef struct _GThread         GThread;
+struct  _GThread
+{
+  GThreadPriority priority;
+  gboolean bound;
+  gboolean joinable;
+};
+
+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
+{
+  GMutex*  (*mutex_new)           (void);
+  void     (*mutex_lock)          (GMutex              *mutex);
+  gboolean (*mutex_trylock)       (GMutex              *mutex);
+  void     (*mutex_unlock)        (GMutex              *mutex);
+  void     (*mutex_free)          (GMutex              *mutex);
+  GCond*   (*cond_new)            (void);
+  void     (*cond_signal)         (GCond               *cond);
+  void     (*cond_broadcast)      (GCond               *cond);
+  void     (*cond_wait)           (GCond               *cond,
+                                  GMutex               *mutex);
+  gboolean (*cond_timed_wait)     (GCond               *cond,
+                                  GMutex               *mutex, 
+                                  GTimeVal             *end_time);
+  void      (*cond_free)          (GCond               *cond);
+  GPrivate* (*private_new)        (GDestroyNotify       destructor);
+  gpointer  (*private_get)        (GPrivate            *private_key);
+  void      (*private_set)        (GPrivate            *private_key,
+                                  gpointer              data);
+  void      (*thread_create)      (GThreadFunc                  thread_func,
+                                  gpointer              arg,
+                                  gulong                stack_size,
+                                  gboolean              joinable,
+                                  gboolean              bound,
+                                  GThreadPriority       priority,
+                                  gpointer              thread,
+                                  GError              **error);
+  void      (*thread_yield)       (void);
+  void      (*thread_join)        (gpointer             thread);
+  void      (*thread_exit)        (void);
+  void      (*thread_set_priority)(gpointer             thread, 
+                                  GThreadPriority       priority);
+  void      (*thread_self)        (gpointer              thread);
+};
+
+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
+ * from another glib-function, e.g. as a callback.
+ */
+void   g_thread_init   (GThreadFunctions       *vtable);
+
+/* internal function for fallback static mutex implementation */
+GMutex*        g_static_mutex_get_mutex_impl   (GMutex **mutex);
+
+/* shorthands for conditional and unconditional function calls */
+#define G_THREAD_UF(name, arglist) \
+    (*g_thread_functions_for_glib_use . name) arglist
+#define G_THREAD_CF(name, fail, arg) \
+    (g_thread_supported () ? G_THREAD_UF (name, arg) : (fail))
+/* keep in mind, all those mutexes and static mutexes are not 
+ * recursive in general, don't rely on that
  */
-extern const guint glib_major_version;
-extern const guint glib_minor_version;
-extern const guint glib_micro_version;
+#define        g_thread_supported()    (g_threads_got_initialized)
+#define g_mutex_new()            G_THREAD_UF (mutex_new,      ())
+#define g_mutex_lock(mutex)      G_THREAD_CF (mutex_lock,     (void)0, (mutex))
+#define g_mutex_trylock(mutex)   G_THREAD_CF (mutex_trylock,  TRUE,    (mutex))
+#define g_mutex_unlock(mutex)    G_THREAD_CF (mutex_unlock,   (void)0, (mutex))
+#define g_mutex_free(mutex)      G_THREAD_CF (mutex_free,     (void)0, (mutex))
+#define g_cond_new()             G_THREAD_UF (cond_new,       ())
+#define g_cond_signal(cond)      G_THREAD_CF (cond_signal,    (void)0, (cond))
+#define g_cond_broadcast(cond)   G_THREAD_CF (cond_broadcast, (void)0, (cond))
+#define g_cond_wait(cond, mutex) G_THREAD_CF (cond_wait,      (void)0, (cond, \
+                                                                        mutex))
+#define g_cond_free(cond)        G_THREAD_CF (cond_free,      (void)0, (cond))
+#define g_cond_timed_wait(cond, mutex, abs_time) G_THREAD_CF (cond_timed_wait, \
+                                                              TRUE, \
+                                                              (cond, mutex, \
+                                                              abs_time))
+#define g_private_new(destructor)        G_THREAD_UF (private_new, (destructor))
+#define g_private_get(private_key)       G_THREAD_CF (private_get, \
+                                                       ((gpointer)private_key), \
+                                                       (private_key))
+#define g_private_set(private_key, value) G_THREAD_CF (private_set, \
+                                                       (void) (private_key = \
+                                                        (GPrivate*) (value)), \
+                                                       (private_key, value))
+#define g_thread_yield()              G_THREAD_CF (thread_yield, (void)0, ())
+#define g_thread_exit()               G_THREAD_CF (thread_exit, (void)0, ())
+
+GThread* g_thread_create (GThreadFunc           thread_func,
+                         gpointer               arg,
+                         gulong                 stack_size,
+                         gboolean               joinable,
+                         gboolean               bound,
+                         GThreadPriority        priority,
+                         GError               **error);
+GThread* g_thread_self ();
+void g_thread_join (GThread *thread);
+void g_thread_set_priority (GThread         *thread, 
+                           GThreadPriority  priority);
+
+/* GStaticMutexes can be statically initialized with the value
+ * G_STATIC_MUTEX_INIT, and then they can directly be used, that is
+ * much easier, than having to explicitly allocate the mutex before
+ * use
+ */
+#define g_static_mutex_lock(mutex) \
+    g_mutex_lock (g_static_mutex_get_mutex (mutex))
+#define g_static_mutex_trylock(mutex) \
+    g_mutex_trylock (g_static_mutex_get_mutex (mutex))
+#define g_static_mutex_unlock(mutex) \
+    g_mutex_unlock (g_static_mutex_get_mutex (mutex)) 
+
+struct _GStaticPrivate
+{
+  guint index;
+};
+#define G_STATIC_PRIVATE_INIT { 0 }
+gpointer g_static_private_get (GStaticPrivate  *private_key);
+void     g_static_private_set (GStaticPrivate  *private_key, 
+                              gpointer          data,
+                              GDestroyNotify    notify);
+gpointer g_static_private_get_for_thread (GStaticPrivate *private_key,
+                                         GThread        *thread);
+void g_static_private_set_for_thread (GStaticPrivate *private_key, 
+                                     GThread        *thread,
+                                     gpointer        data,
+                                     GDestroyNotify  notify);
+
+typedef struct _GStaticRecMutex GStaticRecMutex;
+struct _GStaticRecMutex
+{
+  GStaticMutex mutex;
+  unsigned int depth;
+  GSystemThread owner;
+};
+
+#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
+{
+  GStaticMutex mutex; 
+  GCond *read_cond;
+  GCond *write_cond;
+  guint read_counter;
+  gboolean write;
+  guint want_to_write;
+};
+
+#define G_STATIC_RW_LOCK_INIT { G_STATIC_MUTEX_INIT, NULL, NULL, 0, FALSE, FALSE }
+
+void      g_static_rw_lock_reader_lock    (GStaticRWLock* lock);
+gboolean  g_static_rw_lock_reader_trylock (GStaticRWLock* lock);
+void      g_static_rw_lock_reader_unlock  (GStaticRWLock* lock);
+void      g_static_rw_lock_writer_lock    (GStaticRWLock* lock);
+gboolean  g_static_rw_lock_writer_trylock (GStaticRWLock* lock);
+void      g_static_rw_lock_writer_unlock  (GStaticRWLock* lock);
+void      g_static_rw_lock_free (GStaticRWLock* lock);
+
+/* these are some convenience macros that expand to nothing if GLib
+ * was configured with --disable-threads. for using StaticMutexes,
+ * you define them with G_LOCK_DEFINE_STATIC (name) or G_LOCK_DEFINE (name)
+ * if you need to export the mutex. With G_LOCK_EXTERN (name) you can
+ * declare such an globally defined lock. name is a unique identifier
+ * for the protected varibale or code portion. locking, testing and
+ * unlocking of such mutexes can be done with G_LOCK(), G_UNLOCK() and
+ * G_TRYLOCK() respectively.  
+ */
+extern void glib_dummy_decl (void);
+#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)          \
+    GStaticMutex G_LOCK_NAME (name) = G_STATIC_MUTEX_INIT 
+#  define G_LOCK_EXTERN(name)          extern GStaticMutex G_LOCK_NAME (name)
+
+#  ifdef G_DEBUG_LOCKS
+#    define G_LOCK(name)               G_STMT_START{             \
+        g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,                          \
+              "file %s: line %d (%s): locking: %s ",             \
+              __FILE__,        __LINE__, G_GNUC_PRETTY_FUNCTION, \
+               #name);                                            \
+        g_static_mutex_lock (&G_LOCK_NAME (name));                \
+     }G_STMT_END
+#    define G_UNLOCK(name)             G_STMT_START{             \
+        g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,                          \
+              "file %s: line %d (%s): unlocking: %s ",           \
+              __FILE__,        __LINE__, G_GNUC_PRETTY_FUNCTION, \
+               #name);                                            \
+       g_static_mutex_unlock (&G_LOCK_NAME (name));               \
+     }G_STMT_END
+#    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_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))
+#    define G_TRYLOCK(name) g_static_mutex_trylock (&G_LOCK_NAME (name))
+#  endif /* !G_DEBUG_LOCKS */
+#else  /* !G_THREADS_ENABLED */
+#  define G_LOCK_DEFINE_STATIC(name)   extern void glib_dummy_decl (void)
+#  define G_LOCK_DEFINE(name)          extern void glib_dummy_decl (void)
+#  define G_LOCK_EXTERN(name)          extern void glib_dummy_decl (void)
+#  define G_LOCK(name)
+#  define G_UNLOCK(name)
+#  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,
+                                              GError         **error);
+
+/* 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,
+                                              GError         **error);
+
+/* 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,
+                                              GError         **error);
+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);
+
+typedef enum 
+{
+  G_CONVERT_ERROR_NO_CONVERSION,
+  G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
+  G_CONVERT_ERROR_OTHER
+} GConvertError;
+
+#define G_CONVERT_ERROR g_convert_error_quark()
+GQuark g_convert_error_quark();
+
+gchar* g_convert               (const gchar  *str,
+                               gint          len,
+                               const gchar  *to_codeset,
+                               const gchar  *from_codeset,
+                               gint         *bytes_read,
+                               gint         *bytes_written,
+                               GError      **error);
+gchar* g_convert_with_fallback (const gchar  *str,
+                               gint          len,
+                               const gchar  *to_codeset,
+                               const gchar  *from_codeset,
+                               gchar        *fallback,
+                               gint         *bytes_read,
+                               gint         *bytes_written,
+                               GError      **error);
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
+#include <gunicode.h>
 
 #endif /* __G_LIB_H__ */