Test for localtime_r only after including the right MT enabling CFLAGS
[platform/upstream/glib.git] / glib / glib.h
index 1cd431a..682dbd4 100644 (file)
 #ifndef __G_LIB_H__
 #define __G_LIB_H__
 
+/* 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
+ *
+ * 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 provide the following wrappers to STDC functions:
+ *
+ *  g_ATEXIT
+ *    To register hooks which are executed on exit().
+ *    Usually a wrapper for STDC atexit.
+ *
+ *  void *g_memmove(void *dest, const void *src, guint 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>
 
+/* include varargs functions for assertment macros
+ */
+#include <stdarg.h>
+
+/* optionally feature DMALLOC memory allocation debugger
+ */
 #ifdef USE_DMALLOC
 #include "dmalloc.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>
-
-#define G_MINFLOAT  MINFLOAT
-#define G_MAXFLOAT  MAXFLOAT
-#define G_MINDOUBLE MINDOUBLE
-#define G_MAXDOUBLE MAXDOUBLE
-
-#endif /* HAVE_VALUES_H */
-
+#ifdef NATIVE_WIN32
 
-#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  /* !NATIVE_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 /* !NATIVE_WIN32 */
 
-#endif /* HAVE_VALUES_H */
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
 
 
 /* Provide definitions for some commonly used macros.
 #define CLAMP(x, low, high)  (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
 
 
-/* Provide simple enum value macro wrappers that ease automated enum value
- * stringification code.
+/* 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))
+#  elif defined (G_VA_COPY_AS_ARRAY)
+#  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))
+#  endif /* va_list is a pointer */
+#endif /* !G_VA_COPY */
+
+
+/* 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)   \
+    ((gulong) ((gchar*) &((struct_type*) 0)->member))
+#define G_STRUCT_MEMBER_P(struct_p, struct_offset)   \
+    ((gpointer) ((gchar*) (struct_p) + (gulong) (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.
+ * we special case most of the stuff, so inline functions can have a normal
+ * implementation by defining G_INLINE_FUNC to extern and G_CAN_INLINE to 1.
+ */
+#ifndef G_INLINE_FUNC
+#  define G_CAN_INLINE 1
+#endif
+#ifdef G_HAVE_INLINE
+#  if defined (__GNUC__) && defined (__STRICT_ANSI__)
+#    undef inline
+#    define inline __inline__
+#  endif
+#else /* !G_HAVE_INLINE */
+#  undef inline
+#  if defined (G_HAVE___INLINE__)
+#    define inline __inline__
+#  else /* !inline && !__inline__ */
+#    if 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
+#endif
+#ifndef G_INLINE_FUNC
+#  ifdef __GNUC__
+#    ifdef __OPTIMIZE__
+#      define G_INLINE_FUNC extern inline
+#    else
+#      undef G_CAN_INLINE
+#      define G_INLINE_FUNC extern
+#    endif
+#  else /* !__GNUC__ */
+#    ifdef G_CAN_INLINE
+#      define G_INLINE_FUNC static inline
+#    else
+#      define G_INLINE_FUNC extern
+#    endif
+#  endif /* !__GNUC__ */
+#endif /* !G_INLINE_FUNC */
 
 
 /* Provide simple macro statement wrappers (adapted from Perl):
 #  endif
 #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__ */
 
-/* Hacker macro to place breakpoints for x86 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()
-#endif /* __i386__ */
 
-/* Wrap the __PRETTY_FUNCTION__ and __FUNCTION__ variables with macros,
- * so we can refer to them as strings unconditionally.
+/* 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  ("")
 #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
-#  ifdef HAVE_ATEXIT
-#    define ATEXIT(proc)   (atexit (proc))
-#  elif defined (HAVE_ON_EXIT)
-#    define ATEXIT(proc)   (on_exit ((void (*)(int, void *))(proc), NULL))
-#  endif    
+# define ATEXIT(proc)  g_ATEXIT(proc)
+#else
+# define G_NATIVE_ATEXIT
 #endif /* ATEXIT */
 
+/* Hacker macro to place breakpoints for elected machines.
+ * Actual use is strongly deprecated of course ;)
+ */
+#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()
+#endif /* __i386__ */
+
 
 /* Provide macros for easily allocating memory. The macros
  *  will cast the allocated memory to the specified type
  */
 
 #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__ */
 
+/* alloca-based counterparts of the above routines */
+#if G_HAVE_ALLOCA
+#  define g_alloca alloca
+#  define g_new_a(type, count)   \
+      ((type *) alloca ((unsigned) sizeof (type) * (count)))
+#  define g_new0_a(type, count)          \
+      ((type *) memset (alloca ((unsigned) sizeof (type) * (count)), 0, \
+                       ((unsigned) sizeof (type) * (count))))
+#endif /* G_HAVE_ALLOCA */
+
 #define g_mem_chunk_create(type, pre_alloc, alloc_type)        ( \
   g_mem_chunk_new (#type " mem chunks (" #pre_alloc ")", \
                   sizeof (type), \
   (type *) g_mem_chunk_alloc (chunk) \
 )
 #define g_chunk_new0(type, chunk)      ( \
-  (type *) memset (g_mem_chunk_alloc (chunk), 0, sizeof (type)) \
+  (type *) g_mem_chunk_alloc0 (chunk) \
 )
 #define g_chunk_free(mem, mem_chunk)   G_STMT_START { \
   g_mem_chunk_free ((mem_chunk), (mem)); \
 } 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
- *  in order to support gcc's __PRETTY_FUNCTION__ capability.
+ *  if G_DISABLE_ASSERT is not defined, in order to support gcc's
+ *  __PRETTY_FUNCTION__ capability.
  */
 
 #ifdef G_DISABLE_ASSERT
 
 #ifdef __GNUC__
 
-#define g_assert(expr)                 G_STMT_START{\
-     if (!(expr))                                   \
-       g_error ("file %s: line %d (%s): \"%s\"",     \
-               __FILE__,                            \
-               __LINE__,                            \
-               __PRETTY_FUNCTION__,                 \
-               #expr);                 }G_STMT_END
-
-#define g_assert_not_reached()         G_STMT_START{                 \
-     g_error ("file %s: line %d (%s): \"should not be reached\"",     \
-             __FILE__,                                               \
-             __LINE__,                                               \
-             __PRETTY_FUNCTION__);     }G_STMT_END
+#define g_assert(expr)                 G_STMT_START{           \
+     if (!(expr))                                              \
+       g_log (G_LOG_DOMAIN,                                    \
+             G_LOG_LEVEL_ERROR,                                \
+             "file %s: line %d (%s): assertion failed: (%s)",  \
+             __FILE__,                                         \
+             __LINE__,                                         \
+             __PRETTY_FUNCTION__,                              \
+             #expr);                   }G_STMT_END
+
+#define g_assert_not_reached()         G_STMT_START{           \
+     g_log (G_LOG_DOMAIN,                                      \
+           G_LOG_LEVEL_ERROR,                                  \
+           "file %s: line %d (%s): should not be reached",     \
+           __FILE__,                                           \
+           __LINE__,                                           \
+           __PRETTY_FUNCTION__);       }G_STMT_END
 
 #else /* !__GNUC__ */
 
-#define g_assert(expr)                 G_STMT_START{\
-     if (!(expr))                                   \
-       g_error ("file %s: line %d: \"%s\"",         \
-               __FILE__,                            \
-               __LINE__,                            \
-               #expr);                 }G_STMT_END
-
-#define g_assert_not_reached()         G_STMT_START{                 \
-     g_error ("file %s: line %d: \"should not be reached\"",         \
-             __FILE__,                                               \
-             __LINE__);                }G_STMT_END
+#define g_assert(expr)                 G_STMT_START{           \
+     if (!(expr))                                              \
+       g_log (G_LOG_DOMAIN,                                    \
+             G_LOG_LEVEL_ERROR,                                \
+             "file %s: line %d: assertion failed: (%s)",       \
+             __FILE__,                                         \
+             __LINE__,                                         \
+             #expr);                   }G_STMT_END
+
+#define g_assert_not_reached()         G_STMT_START{   \
+     g_log (G_LOG_DOMAIN,                              \
+           G_LOG_LEVEL_ERROR,                          \
+           "file %s: line %d: should not be reached",  \
+           __FILE__,                                   \
+           __LINE__);          }G_STMT_END
 
 #endif /* __GNUC__ */
 
-#endif /* G_DISABLE_ASSERT */
+#endif /* !G_DISABLE_ASSERT */
+
 
 #ifdef G_DISABLE_CHECKS
 
 
 #ifdef __GNUC__
 
-#define g_return_if_fail(expr)         G_STMT_START{                  \
-     if (!(expr))                                                     \
-       {                                                              \
-        g_warning ("file %s: line %d (%s): assertion \"%s\" failed.", \
-                   __FILE__,                                          \
-                   __LINE__,                                          \
-                   __PRETTY_FUNCTION__,                               \
-                   #expr);                                            \
-        return;                                                       \
+#define g_return_if_fail(expr)         G_STMT_START{                   \
+     if (!(expr))                                                      \
+       {                                                               \
+        g_log (G_LOG_DOMAIN,                                           \
+               G_LOG_LEVEL_CRITICAL,                                   \
+               "file %s: line %d (%s): assertion `%s' failed.",        \
+               __FILE__,                                               \
+               __LINE__,                                               \
+               __PRETTY_FUNCTION__,                                    \
+               #expr);                                                 \
+        return;                                                        \
        };                              }G_STMT_END
 
-#define g_return_val_if_fail(expr,val) G_STMT_START{                  \
-     if (!(expr))                                                     \
-       {                                                              \
-        g_warning ("file %s: line %d (%s): assertion \"%s\" failed.", \
-                   __FILE__,                                          \
-                   __LINE__,                                          \
-                   __PRETTY_FUNCTION__,                               \
-                   #expr);                                            \
-        return val;                                                   \
+#define g_return_val_if_fail(expr,val) G_STMT_START{                   \
+     if (!(expr))                                                      \
+       {                                                               \
+        g_log (G_LOG_DOMAIN,                                           \
+               G_LOG_LEVEL_CRITICAL,                                   \
+               "file %s: line %d (%s): assertion `%s' failed.",        \
+               __FILE__,                                               \
+               __LINE__,                                               \
+               __PRETTY_FUNCTION__,                                    \
+               #expr);                                                 \
+        return val;                                                    \
        };                              }G_STMT_END
 
 #else /* !__GNUC__ */
 
-#define g_return_if_fail(expr)         G_STMT_START{             \
-     if (!(expr))                                                \
-       {                                                         \
-        g_warning ("file %s: line %d: assertion. \"%s\" failed", \
-                   __FILE__,                                     \
-                   __LINE__,                                     \
-                   #expr);                                       \
-        return;                                                  \
+#define g_return_if_fail(expr)         G_STMT_START{           \
+     if (!(expr))                                              \
+       {                                                       \
+        g_log (G_LOG_DOMAIN,                                   \
+               G_LOG_LEVEL_CRITICAL,                           \
+               "file %s: line %d: assertion `%s' failed.",     \
+               __FILE__,                                       \
+               __LINE__,                                       \
+               #expr);                                         \
+        return;                                                \
        };                              }G_STMT_END
 
-#define g_return_val_if_fail(expr, val)        G_STMT_START{             \
-     if (!(expr))                                                \
-       {                                                         \
-        g_warning ("file %s: line %d: assertion \"%s\" failed.", \
-                   __FILE__,                                     \
-                   __LINE__,                                     \
-                   #expr);                                       \
-        return val;                                              \
+#define g_return_val_if_fail(expr, val)        G_STMT_START{           \
+     if (!(expr))                                              \
+       {                                                       \
+        g_log (G_LOG_DOMAIN,                                   \
+               G_LOG_LEVEL_CRITICAL,                           \
+               "file %s: line %d: assertion `%s' failed.",     \
+               __FILE__,                                       \
+               __LINE__,                                       \
+               #expr);                                         \
+        return val;                                            \
        };                              }G_STMT_END
 
 #endif /* !__GNUC__ */
 
-#endif /* G_DISABLE_CHECKS */
+#endif /* !G_DISABLE_CHECKS */
 
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
 /* Provide type definitions for commonly used types.
  *  These are useful because a "gint8" can be adjusted
  *  to be 1 byte (8 bits) on all platforms. Similarly and
@@ -377,7 +475,7 @@ typedef unsigned int        guint;
 typedef float  gfloat;
 typedef double gdouble;
 
-/* HAVE_LONG_DOUBLE doesn't work correctly on all platforms. 
+/* HAVE_LONG_DOUBLE doesn't work correctly on all platforms.
  * Since gldouble isn't used anywhere, just disable it for now */
 
 #if 0
@@ -391,119 +489,310 @@ 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 gint32 gssize;
+typedef guint32 gsize;
+typedef guint32 GQuark;
+typedef gint32 GTime;
 
-/* Define macros for storing integers inside pointers */
 
-#if (SIZEOF_INT == SIZEOF_VOID_P)
+/* Portable endian checks and conversions
+ *
+ * glibconfig.h defines G_BYTE_ORDER which expands to one of
+ * the below macros.
+ */
+#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
-/* 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))
 
-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;
+
+/* Glib version.
+ * we prefix variable declarations so they can
+ * properly get exported in windows dlls.
+ */
+#ifdef NATIVE_WIN32
+#  ifdef GLIB_COMPILATION
+#    define GUTILS_C_VAR __declspec(dllexport)
+#  else /* !GLIB_COMPILATION */
+#    define GUTILS_C_VAR extern __declspec(dllimport)
+#  endif /* !GLIB_COMPILATION */
+#else /* !NATIVE_WIN32 */
+#  define GUTILS_C_VAR extern
+#endif /* !NATIVE_WIN32 */
+
+GUTILS_C_VAR const guint glib_major_version;
+GUTILS_C_VAR const guint glib_minor_version;
+GUTILS_C_VAR const guint glib_micro_version;
+GUTILS_C_VAR const guint glib_interface_age;
+GUTILS_C_VAR const guint glib_binary_age;
+
+
+/* Forward declarations of glib types.
+ */
+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 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 _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 _GTree          GTree;
 typedef struct _GTuples                GTuples;
-typedef struct _GNode          GNode;
+typedef union  _GTokenValue    GTokenValue;
+typedef struct _GIOChannel     GIOChannel;
+
+typedef enum
+{
+  G_TRAVERSE_LEAFS     = 1 << 0,
+  G_TRAVERSE_NON_LEAFS = 1 << 1,
+  G_TRAVERSE_ALL       = G_TRAVERSE_LEAFS | G_TRAVERSE_NON_LEAFS,
+  G_TRAVERSE_MASK      = 0x03
+} GTraverseFlags;
+
+typedef enum
+{
+  G_IN_ORDER,
+  G_PRE_ORDER,
+  G_POST_ORDER,
+  G_LEVEL_ORDER
+} GTraverseType;
+
+/* Log level shift offset for user defined
+ * log levels (0-7 are used by GLib).
+ */
+#define        G_LOG_LEVEL_USER_SHIFT  (8)
+
+/* Glib log levels and flags.
+ */
+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,
+  G_LOG_LEVEL_WARNING          = 1 << 4,
+  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;
+
+/* GLib log levels that are considered fatal by default */
+#define        G_LOG_FATAL_MASK        (G_LOG_FLAG_RECURSION | G_LOG_LEVEL_ERROR)
 
 
-typedef void           (*GFunc)                (gpointer  data,
-                                                gpointer  user_data);
-typedef void           (*GHFunc)               (gpointer  key,
-                                                gpointer  value,
-                                                gpointer  user_data);
-typedef gpointer       (*GCacheNewFunc)        (gpointer  key);
-typedef gpointer       (*GCacheDupFunc)        (gpointer  value);
-typedef void           (*GCacheDestroyFunc)    (gpointer  value);
-typedef gint           (*GTraverseFunc)        (gpointer  key,
-                                                gpointer  value,
-                                                gpointer  data);
-typedef gboolean       (*GNodeTraverseFunc)    (GNode    *node,
-                                                gpointer  data);
-typedef void           (*GNodeForeachFunc)     (GNode    *node,
-                                                gpointer  data);
-typedef gint           (*GSearchFunc)          (gpointer  key,
-                                                gpointer  data);
-typedef void           (*GErrorFunc)           (gchar    *str);
-typedef void           (*GWarningFunc)         (gchar    *str);
-typedef void           (*GPrintFunc)           (gchar    *str);
-typedef void           (*GScannerMsgFunc)      (GScanner *scanner,
-                                                gchar    *message,
-                                                gint      error);
-typedef void           (*GDestroyNotify)       (gpointer  data);
-
-typedef guint          (*GHashFunc)            (gconstpointer    key);
-typedef gint           (*GCompareFunc)         (gconstpointer    a,
-                                                gconstpointer    b);
+typedef gpointer       (*GCacheNewFunc)        (gpointer       key);
+typedef gpointer       (*GCacheDupFunc)        (gpointer       value);
+typedef void           (*GCacheDestroyFunc)    (gpointer       value);
+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,
+                                                gpointer       user_data);
+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 _GList
 {
@@ -553,31 +842,11 @@ struct _GDebugKey
   guint         value;
 };
 
-struct _GCache { gint dummy; };
-struct _GTree { gint dummy; };
-struct _GTimer { gint dummy; };
-struct _GMemChunk { gint dummy; };
-struct _GListAllocator { gint dummy; };
-struct _GStringChunk { gint dummy; };
-
-typedef enum
-{
-  G_IN_ORDER,
-  G_PRE_ORDER,
-  G_POST_ORDER,
-  G_LEVEL_ORDER
-} GTraverseType;
-
-typedef enum
-{
-  G_TRAVERSE_LEAFS     = 1 << 0,
-  G_TRAVERSE_NON_LEAFS = 1 << 1,
-  G_TRAVERSE_ALL       = G_TRAVERSE_LEAFS | G_TRAVERSE_NON_LEAFS,
-  G_TRAVERSE_MASK      = 0x03
-} GTraverseFlags;
 
 /* 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);
@@ -590,14 +859,15 @@ GList* g_list_insert              (GList          *list,
                                 gint            position);
 GList* g_list_insert_sorted    (GList          *list,
                                 gpointer        data,
-                                GCompareFunc    func);                     
-GList* g_list_concat           (GList          *list1, 
+                                GCompareFunc    func);
+GList* g_list_concat           (GList          *list1,
                                 GList          *list2);
 GList* g_list_remove           (GList          *list,
                                 gpointer        data);
 GList* g_list_remove_link      (GList          *list,
-                                GList          *link);
+                                GList          *llink);
 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,
@@ -606,7 +876,7 @@ GList* g_list_find_custom   (GList          *list,
                                 gpointer        data,
                                 GCompareFunc    func);
 gint   g_list_position         (GList          *list,
-                                GList          *link);
+                                GList          *llink);
 gint   g_list_index            (GList          *list,
                                 gpointer        data);
 GList* g_list_last             (GList          *list);
@@ -615,14 +885,18 @@ 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)
 #define g_list_next(list)      ((list) ? (((GList *)(list))->next) : NULL)
 
+
 /* 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);
@@ -635,14 +909,15 @@ GSList* g_slist_insert            (GSList         *list,
                                 gint            position);
 GSList* g_slist_insert_sorted  (GSList         *list,
                                 gpointer        data,
-                                GCompareFunc    func);                     
-GSList* g_slist_concat         (GSList         *list1, 
+                                GCompareFunc    func);
+GSList* g_slist_concat         (GSList         *list1,
                                 GSList         *list2);
 GSList* g_slist_remove         (GSList         *list,
                                 gpointer        data);
 GSList* g_slist_remove_link    (GSList         *list,
-                                GSList         *link);
+                                GSList         *llink);
 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,
@@ -651,7 +926,7 @@ GSList* g_slist_find_custom (GSList         *list,
                                 gpointer        data,
                                 GCompareFunc    func);
 gint   g_slist_position        (GSList         *list,
-                                GSList         *link);
+                                GSList         *llink);
 gint   g_slist_index           (GSList         *list,
                                 gpointer        data);
 GSList* g_slist_last           (GSList         *list);
@@ -659,18 +934,12 @@ 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)
 
-/* List Allocators
- */
-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);
-
 
 /* Hash tables
  */
@@ -693,6 +962,9 @@ 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_foreach_remove (GHashTable     *hash_table,
+                                        GHRFunc         func,
+                                        gpointer        user_data);
 gint       g_hash_table_size           (GHashTable     *hash_table);
 
 
@@ -746,10 +1018,10 @@ gint      g_tree_nnodes   (GTree         *tree);
 struct _GNode
 {
   gpointer data;
-  GNode *next;
-  GNode *prev;
-  GNode *parent;
-  GNode *children;
+  GNode          *next;
+  GNode          *prev;
+  GNode          *parent;
+  GNode          *children;
 };
 
 #define         G_NODE_IS_ROOT(node)   (((GNode*) (node))->parent == NULL && \
@@ -757,16 +1029,18 @@ 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);
-void    g_node_insert          (GNode            *parent,
+GNode*  g_node_insert          (GNode            *parent,
                                 gint              position,
                                 GNode            *node);
-void    g_node_insert_before   (GNode            *parent,
+GNode*  g_node_insert_before   (GNode            *parent,
                                 GNode            *sibling,
                                 GNode            *node);
-void    g_node_prepend         (GNode            *parent,
+GNode*  g_node_prepend         (GNode            *parent,
                                 GNode            *node);
 guint   g_node_n_nodes         (GNode            *root,
                                 GTraverseFlags    flags);
@@ -780,21 +1054,16 @@ GNode*    g_node_find            (GNode            *root,
                                 gpointer          data);
 
 /* convenience macros */
-#define g_node_append(parent, node)    G_STMT_START { \
-  g_node_insert_before ((parent), NULL, (node)); \
-} G_STMT_END
-#define        g_node_insert_data(parent, position, data) G_STMT_START { \
-  g_node_insert ((parent), (position), g_node_new ((data))); \
-} G_STMT_END
-#define        g_node_insert_data_before(parent, sibling, data) G_STMT_START { \
-  g_node_insert_before ((parent), (sibling), g_node_new ((data))); \
-} G_STMT_END
-#define        g_node_prepend_data(parent, data)                G_STMT_START { \
-  g_node_prepend ((parent), g_node_new ((data))); \
-} G_STMT_END
-#define        g_node_append_data(parent, data) G_STMT_START { \
-  g_node_insert_before ((parent), NULL, g_node_new ((data))); \
-} G_STMT_END
+#define g_node_append(parent, node)                            \
+     g_node_insert_before ((parent), NULL, (node))
+#define        g_node_insert_data(parent, position, data)              \
+     g_node_insert ((parent), (position), g_node_new (data))
+#define        g_node_insert_data_before(parent, sibling, data)        \
+     g_node_insert_before ((parent), (sibling), g_node_new (data))
+#define        g_node_prepend_data(parent, data)                       \
+     g_node_prepend ((parent), g_node_new (data))
+#define        g_node_append_data(parent, data)                        \
+     g_node_insert_before ((parent), NULL, g_node_new (data))
 
 /* traversal function, assumes that `node' is root
  * (only traverses `node' and its subtree).
@@ -843,18 +1112,232 @@ 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;
+
+struct _GHookList
+{
+  guint                 seq_id;
+  guint                 hook_size;
+  guint                 is_setup : 1;
+  GHook                *hooks;
+  GMemChunk    *hook_memchunk;
+  GHookFreeFunc         hook_free; /* 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))
 
-/* Memory
+/* 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.
+ * g_on_error_stack_trace() invokes gdb, which attaches to the current
+ * process and shows a stack trace.
+ * These function may cause different actions on non-unix platforms.
+ * The prg_name arg is required by gdb to find the executable, if it is
+ * passed as NULL, g_on_error_query() will try g_get_prgname().
+ */
+void g_on_error_query (const gchar *prg_name);
+void g_on_error_stack_trace (const gchar *prg_name);
+
 
+/* Logging mechanism
+ */
+extern         const gchar             *g_log_domain_glib;
+guint          g_log_set_handler       (const gchar    *log_domain,
+                                        GLogLevelFlags  log_levels,
+                                        GLogFunc        log_func,
+                                        gpointer        user_data);
+void           g_log_remove_handler    (const gchar    *log_domain,
+                                        guint           handler_id);
+void           g_log_default_handler   (const gchar    *log_domain,
+                                        GLogLevelFlags  log_level,
+                                        const gchar    *message,
+                                        gpointer        unused_data);
+void           g_log                   (const gchar    *log_domain,
+                                        GLogLevelFlags  log_level,
+                                        const gchar    *format,
+                                        ...) G_GNUC_PRINTF (3, 4);
+void           g_logv                  (const gchar    *log_domain,
+                                        GLogLevelFlags  log_level,
+                                        const gchar    *format,
+                                        va_list         args);
+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)
+#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)
+#else  /* !__GNUC__ */
+static inline void
+g_error (const gchar *format,
+        ...)
+{
+  va_list args;
+  va_start (args, format);
+  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, format, args);
+  va_end (args);
+}
+static inline void
+g_message (const gchar *format,
+          ...)
+{
+  va_list args;
+  va_start (args, format);
+  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, format, args);
+  va_end (args);
+}
+static inline void
+g_warning (const gchar *format,
+          ...)
+{
+  va_list args;
+  va_start (args, format);
+  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, format, args);
+  va_end (args);
+}
+#endif /* !__GNUC__ */
+
+typedef void   (*GPrintFunc)           (const gchar    *string);
+void           g_print                 (const gchar    *format,
+                                        ...) G_GNUC_PRINTF (1, 2);
+GPrintFunc     g_set_print_handler     (GPrintFunc      func);
+void           g_printerr              (const gchar    *format,
+                                        ...) G_GNUC_PRINTF (1, 2);
+GPrintFunc     g_set_printerr_handler  (GPrintFunc      func);
+
+/* deprecated compatibility functions, use g_log_set_handler() instead */
+typedef void           (*GErrorFunc)           (const gchar *str);
+typedef void           (*GWarningFunc)         (const gchar *str);
+GErrorFunc   g_set_error_handler   (GErrorFunc  func);
+GWarningFunc g_set_warning_handler (GWarningFunc func);
+GPrintFunc   g_set_message_handler (GPrintFunc func);
+
+
+/* Memory allocation and debugging
+ */
 #ifdef USE_DMALLOC
 
-#define g_malloc(size)      (gpointer) MALLOC(size)
-#define g_malloc0(size)             (gpointer) CALLOC(char,size)
-#define g_realloc(mem,size)  (gpointer) REALLOC(mem,char,size)
-#define g_free(mem)         FREE(mem)
+#define g_malloc(size)      ((gpointer) MALLOC (size))
+#define g_malloc0(size)             ((gpointer) CALLOC (char, size))
+#define g_realloc(mem,size)  ((gpointer) REALLOC (mem, char, size))
+#define g_free(mem)         FREE (mem)
 
-#else /* USE_DMALLOC */
+#else /* !USE_DMALLOC */
 
 gpointer g_malloc      (gulong   size);
 gpointer g_malloc0     (gulong   size);
@@ -862,11 +1345,21 @@ gpointer g_realloc     (gpointer  mem,
                        gulong    size);
 void    g_free        (gpointer  mem);
 
-#endif /* USE_DMALLOC */
+#endif /* !USE_DMALLOC */
 
 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
@@ -896,6 +1389,7 @@ GMemChunk* g_mem_chunk_new     (gchar        *name,
                                gint       type);
 void      g_mem_chunk_destroy (GMemChunk *mem_chunk);
 gpointer   g_mem_chunk_alloc   (GMemChunk *mem_chunk);
+gpointer   g_mem_chunk_alloc0  (GMemChunk *mem_chunk);
 void      g_mem_chunk_free    (GMemChunk *mem_chunk,
                                gpointer   mem);
 void      g_mem_chunk_clean   (GMemChunk *mem_chunk);
@@ -925,35 +1419,140 @@ gdouble g_timer_elapsed (GTimer  *timer,
                         gulong  *microseconds);
 
 
-/* Output
- */
-void g_error   (const gchar *format, ...) G_GNUC_PRINTF (1, 2);
-void g_warning (const gchar *format, ...) G_GNUC_PRINTF (1, 2);
-void g_message (const gchar *format, ...) G_GNUC_PRINTF (1, 2);
-void g_print   (const gchar *format, ...) G_GNUC_PRINTF (1, 2);
-
-
-/* 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_strconcat             (const gchar *string1,
-                                ...); /* NULL terminated */
-gdouble g_strtod               (const gchar *nptr,
+gdouble         g_strtod               (const gchar *nptr,
                                 gchar      **endptr);
-gchar* g_strerror              (gint         errnum);
-gchar* g_strsignal             (gint         signum);
-gint   g_strcasecmp            (const gchar *s1,
+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);
+gint    g_strncasecmp          (const gchar *s1,
+                                const gchar *s2,
+                                guint        n);
+void    g_strdown              (gchar       *string);
+void    g_strup                (gchar       *string);
+void    g_strreverse           (gchar       *string);
+/* 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 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,
+                                va_list      args);
+gchar*  g_strndup              (const gchar *str,
+                                guint        n);
+gchar*  g_strnfill             (guint        length,
+                                gchar        fill_char);
+gchar*  g_strconcat            (const gchar *string1,
+                                ...); /* NULL terminated */
+gchar*   g_strjoin             (const gchar  *separator,
+                                ...); /* NULL terminated */
+gchar*  g_strescape            (gchar        *string);
+gpointer g_memdup              (gconstpointer mem,
+                                guint         byte_size);
+
+/* Macros for dynamic strings via fast stack allocation
+ * All macros take a special first argument: the target gchar* string
+ */
+#if G_HAVE_ALLOCA
+#  define g_strdup_a(newstr,str) G_STMT_START { \
+         gchar *__new;                         \
+         const gchar *__old = (str);           \
+         if (__old)                            \
+         {                                     \
+           size_t __len = strlen (__old) + 1;  \
+           __new = alloca (__len);             \
+           memcpy (__new, __old, __len);       \
+         }                                     \
+          else                                 \
+            __new = NULL;                      \
+          (newstr) = __new;                    \
+   } G_STMT_END
+#  define g_strndup_a(newstr,str,n) G_STMT_START { \
+         gchar *__new;                         \
+         const gchar *__old = (str);           \
+         if (__old)                            \
+         {                                     \
+            guint __n = (n);                   \
+           size_t __len = strlen (__old);      \
+           if (__len > (__n))                  \
+              __len = (__n);                   \
+           __new = alloca (__len + 1);         \
+           memcpy (__new, __old, __len);       \
+           __new[__len] = 0;                   \
+         }                                     \
+          else                                  \
+            __new = NULL;                       \
+         (newstr) = __new;                     \
+   } G_STMT_END
+#  define g_strconcat3_a(newstr,str1,str2,str3) G_STMT_START { \
+          const gchar *__str1 = (str1);                                \
+          const gchar *__str2 = (str2);                                \
+          const gchar *__str3 = (str3);                                \
+         gchar *__new;                                         \
+          if (__str1) {                                                \
+           size_t __len1 = strlen (__str1);                    \
+           if (__str2) {                                       \
+             size_t __len2 = strlen (__str2);                  \
+             if (__str3) {                                     \
+               size_t __len3 = strlen (__str3);                \
+               __new = alloca (__len1 + __len2 + __len3 + 1);  \
+               __new[__len1 + __len2 + __len3] = 0;            \
+               memcpy (__new + __len1 + __len2, __str3, __len3); \
+             } else {                                          \
+               __new = alloca (__len1 + __len2 + 1);           \
+               __new[__len1 + __len2] = 0;                     \
+             }                                                 \
+             memcpy (__new + __len1, __str2, __len2);          \
+           } else {                                            \
+             __new = alloca (__len1 + 1);                      \
+             __new[__len1] = 0;                                \
+           }                                                   \
+           memcpy (__new, __str1, __len1);                     \
+         } else                                                \
+           __new = NULL;                                       \
+         (newstr) = __new;                                     \
+   } G_STMT_END
+#endif /* G_HAVE_ALLOCA */
+
+
+/* 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);
+
 
 
-/* Retrive static info
+/* calculate a string size, guarranteed to fit format + args.
+ */
+guint  g_printf_string_upper_bound (const gchar* format,
+                                    va_list      args);
+
+
+/* Retrive static string info
  */
 gchar* g_get_user_name         (void);
 gchar* g_get_real_name         (void);
@@ -965,43 +1564,93 @@ void     g_set_prgname           (const gchar *prgname);
 
 /* Miscellaneous utility functions
  */
-guint  g_parse_debug_string    (const gchar *string, 
-                                GDebugKey   *keys, 
+guint  g_parse_debug_string    (const gchar *string,
+                                GDebugKey   *keys,
                                 guint        nkeys);
 gint   g_snprintf              (gchar       *string,
                                 gulong       n,
                                 gchar const *format,
                                 ...) G_GNUC_PRINTF (3, 4);
+gint   g_vsnprintf             (gchar       *string,
+                                gulong       n,
+                                gchar const *format,
+                                va_list      args);
 gchar* g_basename              (const gchar *file_name);
+/* Check if a file name is an absolute path */
+gboolean g_path_is_absolute    (const gchar *file_name);
+/* In case of absolute paths, skip the root part */
+gchar*  g_path_skip_root       (gchar       *file_name);
 
 /* strings are newly allocated with g_malloc() */
 gchar* g_dirname               (const gchar *file_name);
 gchar* g_get_current_dir       (void);
+gchar*  g_getenv               (const gchar *variable);
 
 
-/* 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) */
-#ifdef HAVE_MEMMOVE
-#define g_memmove memmove
-#else 
-#define g_memmove(a,b,c)       bcopy((b), (a), (c))
-#endif
-
-/* Errors
+/* 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.
  */
-GErrorFunc   g_set_error_handler   (GErrorFunc  func);
-GWarningFunc g_set_warning_handler (GWarningFunc func);
-GPrintFunc   g_set_message_handler (GPrintFunc func);
-GPrintFunc   g_set_print_handler   (GPrintFunc func);
+void   g_atexit                (GVoidFunc    func);
 
-void g_debug         (const gchar *progname);
-void g_attach_process (const gchar *progname,
-                      gint         query);
-void g_stack_trace    (const gchar *progname,
-                      gint         query);
 
+/* Bit tests
+ */
+G_INLINE_FUNC gint     g_bit_nth_lsf (guint32 mask,
+                                      gint    nth_bit);
+#ifdef G_CAN_INLINE
+G_INLINE_FUNC gint
+g_bit_nth_lsf (guint32 mask,
+              gint    nth_bit)
+{
+  do
+    {
+      nth_bit++;
+      if (mask & (1 << (guint) nth_bit))
+       return nth_bit;
+    }
+  while (nth_bit < 32);
+  return -1;
+}
+#endif /* G_CAN_INLINE */
+
+G_INLINE_FUNC gint     g_bit_nth_msf (guint32 mask,
+                                      gint    nth_bit);
+#ifdef G_CAN_INLINE
+G_INLINE_FUNC gint
+g_bit_nth_msf (guint32 mask,
+              gint    nth_bit)
+{
+  if (nth_bit < 0)
+    nth_bit = 32;
+  do
+    {
+      nth_bit--;
+      if (mask & (1 << (guint) nth_bit))
+       return nth_bit;
+    }
+  while (nth_bit > 0);
+  return -1;
+}
+#endif /* G_CAN_INLINE */
 
+G_INLINE_FUNC guint    g_bit_storage (guint number);
+#ifdef G_CAN_INLINE
+G_INLINE_FUNC guint
+g_bit_storage (guint number)
+{
+  register guint n_bits = 0;
+  
+  do
+    {
+      n_bits++;
+      number >>= 1;
+    }
+  while (number);
+  return n_bits;
+}
+#endif /* G_CAN_INLINE */
 
 /* String Chunks
  */
@@ -1012,6 +1661,7 @@ gchar*          g_string_chunk_insert        (GStringChunk *chunk,
 gchar*       g_string_chunk_insert_const  (GStringChunk *chunk,
                                            const gchar  *string);
 
+
 /* Strings
  */
 GString* g_string_new      (const gchar *init);
@@ -1030,14 +1680,14 @@ 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, 
+GString* g_string_insert    (GString    *string,
+                            gint         pos,
                             const gchar *val);
-GString* g_string_insert_c  (GString    *string, 
-                            gint         pos, 
+GString* g_string_insert_c  (GString    *string,
+                            gint         pos,
                             gchar        c);
-GString* g_string_erase            (GString     *string, 
-                            gint         pos, 
+GString* g_string_erase            (GString     *string,
+                            gint         pos,
                             gint         len);
 GString* g_string_down     (GString     *string);
 GString* g_string_up       (GString     *string);
@@ -1048,52 +1698,58 @@ void     g_string_sprintfa  (GString     *string,
                             const gchar *format,
                             ...) G_GNUC_PRINTF (2, 3);
 
-/* Resizable arrays
- */
-#define g_array_length(array,type) \
-     (((array)->len)/sizeof(type))
-#define g_array_append_val(array,type,val) \
-     g_rarray_append (array, (gpointer) &val, sizeof (type))
-#define g_array_append_vals(array,type,vals,nvals) \
-     g_rarray_append (array, (gpointer) vals, sizeof (type) * nvals)
-#define g_array_prepend_val(array,type,val) \
-     g_rarray_prepend (array, (gpointer) &val, sizeof (type))
-#define g_array_prepend_vals(array,type,vals,nvals) \
-     g_rarray_prepend (array, (gpointer) vals, sizeof (type) * nvals)
-#define g_array_truncate(array,type,length) \
-     g_rarray_truncate (array, length, sizeof (type))
-#define g_array_index(array,type,index) \
-     ((type*) array->data)[index]
-
-GArray* g_array_new      (gint      zero_terminated);
-void   g_array_free      (GArray   *array,
-                          gint      free_segment);
-GArray* g_rarray_append          (GArray   *array,
-                          gpointer  data,
-                          gint      size);
-GArray* g_rarray_prepend  (GArray   *array,
-                          gpointer  data,
-                          gint      size);
-GArray* g_rarray_truncate (GArray   *array,
-                          gint      length,
-                          gint      size);
+
+/* 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);
+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_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,
                                            gboolean     free_seg);
 void       g_ptr_array_set_size           (GPtrArray   *array,
                                            gint         length);
-void       g_ptr_array_remove_index       (GPtrArray   *array,
-                                           gint         index);
+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);
 
@@ -1101,31 +1757,32 @@ void        g_ptr_array_add                (GPtrArray   *array,
  * but type-safe.
  */
 
-GByteArray* g_byte_array_new     (void);
-void       g_byte_array_free     (GByteArray *array,
-                                  gint        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_truncate (GByteArray *array,
-                                  gint        length);
+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_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);
+guint g_str_hash  (gconstpointer   v);
 
-gint  g_int_equal (gconstpointer v,
-                  gconstpointer v2);
-guint g_int_hash  (gconstpointer v);
+gint  g_int_equal (gconstpointer   v,
+                  gconstpointer   v2);
+guint g_int_hash  (gconstpointer   v);
 
 /* This "hash" function will just return the key's adress as an
  * unsigned integer. Useful for hashing on plain adresses or
@@ -1143,26 +1800,66 @@ GQuark    g_quark_from_static_string    (const gchar    *string);
 GQuark   g_quark_from_string           (const gchar    *string);
 gchar*   g_quark_to_string             (GQuark          quark);
 
-/* Location Associated 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);
 
-#define          g_dataset_id_set_data(l,k,d)  G_STMT_START{g_dataset_id_set_data_full((l),(k),(d),NULL);}G_STMT_END
-#define          g_dataset_id_remove_data(l,k) G_STMT_START{g_dataset_id_set_data((l),(k),NULL);}G_STMT_END
-#define          g_dataset_get_data(l,k)       (g_dataset_id_get_data((l),g_quark_try_string(k)))
-#define          g_dataset_set_data_full(l,k,d,f) G_STMT_START{g_dataset_id_set_data_full((l),g_quark_from_string(k),(d),(f));}G_STMT_END
-#define          g_dataset_set_destroy(l,k,f)  G_STMT_START{g_dataset_id_set_destroy((l),g_quark_from_string(k),(f));}G_STMT_END
-#define          g_dataset_set_data(l,k,d)     G_STMT_START{g_dataset_set_data_full((l),(k),(d),NULL);}G_STMT_END
-#define          g_dataset_remove_data(l,k)    G_STMT_START{g_dataset_set_data((l),(k),NULL);}G_STMT_END
+/* 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);
+void     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_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)        \
+     g_dataset_id_set_data ((l), (k), NULL)
+#define          g_dataset_get_data(l, k)              \
+     (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_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_id_set_data ((l), g_quark_try_string (k), NULL)
 
 
 /* GScanner: Flexible lexical scanner for general purpose.
@@ -1228,7 +1925,7 @@ typedef enum
   G_TOKEN_LAST
 } GTokenType;
 
-union  _GValue
+union  _GTokenValue
 {
   gpointer     v_symbol;
   gchar                *v_identifier;
@@ -1301,22 +1998,22 @@ struct  _GScanner
   
   /* 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 */
@@ -1327,13 +2024,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);
@@ -1352,7 +2050,7 @@ 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);
@@ -1383,8 +2081,8 @@ gint              g_scanner_stat_mode             (const gchar    *filename);
 } G_STMT_END
 
 
-
-/* Completion */
+/* GCompletion
+ */
 
 struct _GCompletion
 {
@@ -1396,18 +2094,208 @@ struct _GCompletion
 };
 
 GCompletion* g_completion_new         (GCompletionFunc func);
-void        g_completion_add_items    (GCompletion*    cmp, 
+void        g_completion_add_items    (GCompletion*    cmp,
                                        GList*          items);
-void        g_completion_remove_items (GCompletion*    cmp, 
+void        g_completion_remove_items (GCompletion*    cmp,
                                        GList*          items);
 void        g_completion_clear_items  (GCompletion*    cmp);
-GList*      g_completion_complete     (GCompletion*    cmp, 
+GList*      g_completion_complete     (GCompletion*    cmp,
                                        gchar*          prefix,
                                        gchar**         new_prefix);
 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);
+guint8       g_date_days_in_month         (GDateMonth   month, 
+                                           GDateYear    year);
+guint8       g_date_monday_weeks_in_year  (GDateYear    year);
+guint8       g_date_sunday_weeks_in_year  (GDateYear    year);
+
+/* 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.
  *
@@ -1455,13 +2343,445 @@ gpointer   g_tuples_index     (GTuples    *tuples,
                               gint         field);
 
 
-/* Glib version.
+/* 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
+ * next largest prime, or the highest it knows about which is about
+ * MAXINT/4.
+ */
+guint     g_spaced_primes_closest (guint num);
+
+
+/* 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);
+  gboolean (*check)    (gpointer  source_data,
+                       GTimeVal *current_time);
+  gboolean (*dispatch) (gpointer  source_data, 
+                       GTimeVal *current_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);
+void g_source_remove                (guint          tag);
+void g_source_remove_by_user_data   (gpointer       user_data);
+void g_source_remove_by_source_data (gpointer       source_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);
+
+/* GPollFD
+ *
+ * Unix-specific IO and main loop calls
+ */
+
+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);
+
+GIOChannel* g_io_channel_unix_new    (int         fd);
+gint        g_io_channel_unix_get_fd (GIOChannel *channel);
+
+
+/* old IO Channels */
+#if 0
+/* IO Channels.
+ * These are used for plug-in communication in the GIMP, for instance.
+ * On Unix, it's simply an encapsulated file descriptor (a pipe).
+ * On Windows, it's a handle to an anonymouos pipe, *and* (in the case
+ * of the writable end) a thread id to post a message to when you have written
+ * stuff.
+ */
+struct _GIOChannel
+{
+  gint fd;                     /* file handle (pseudo such in Win32) */
+#ifdef NATIVE_WIN32
+  guint peer;                  /* thread to post message to */
+  guint peer_fd;               /* read handle (in the other process) */
+  guint offset;                        /* counter of accumulated bytes, to
+                                * be included in the message posted
+                                * so we keep in sync.
+                                */
+  guint need_wakeups;          /* in output channels whether the reader
+                                * needs wakeups
+                                */
+#endif
+};
+GIOChannel *g_iochannel_new            (gint        fd);
+void        g_iochannel_free           (GIOChannel *channel);
+void        g_iochannel_close_and_free (GIOChannel *channel);
+void        g_iochannel_wakeup_peer    (GIOChannel *channel);
+#ifndef NATIVE_WIN32
+#  define   g_iochannel_wakeup_peer(channel) G_STMT_START { } G_STMT_END
+#endif
+#endif /* old IO Channels */
+
+
+/* Windows emulation stubs for common unix functions
+ */
+#ifdef NATIVE_WIN32
+#  define MAXPATHLEN 1024
+#  ifdef _MSC_VER
+typedef int pid_t;
+
+/* These POSIXish functions are available in the Microsoft C library
+ * prefixed with underscore (which of course technically speaking is
+ * the Right Thing, as they are non-ANSI. Not that being non-ANSI
+ * prevents Microsoft from practically requiring you to include
+ * <windows.h> every now and then...).
+ *
+ * You still need to include the appropriate headers to get the
+ * prototypes, <io.h> or <direct.h>.
+ *
+ * For some functions, we provide emulators in glib, which are prefixed
+ * with gwin_.
+ */
+#    define getcwd             _getcwd
+#    define getpid             _getpid
+#    define access             _access
+#    define open               _open
+#    define read               _read
+#    define write              _write
+#    define lseek              _lseek
+#    define close              _close
+#    define pipe(phandles)     _pipe (phandles, 4096, _O_BINARY)
+#    define popen              _popen
+#    define pclose             _pclose
+#    define fdopen             _fdopen
+#    define ftruncate(fd, size)        gwin_ftruncate (fd, size)
+#    define opendir            gwin_opendir
+#    define readdir            gwin_readdir
+#    define rewinddir          gwin_rewinddir
+#    define closedir           gwin_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     gwin_ftruncate  (gint            f,
+                                guint           size);
+DIR*           gwin_opendir    (const gchar    *dirname);
+struct dirent* gwin_readdir    (DIR            *dir);
+void           gwin_rewinddir  (DIR            *dir);
+gint           gwin_closedir   (DIR            *dir);
+#  endif /* _MSC_VER */
+#endif  /* NATIVE_WIN32 */
+
+
+/* GLib Thread support
+ */
+typedef struct _GMutex         GMutex;
+typedef struct _GCond          GCond;
+typedef struct _GPrivate       GPrivate;
+typedef struct _GStaticPrivate GStaticPrivate;
+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);
+};
+
+GUTILS_C_VAR GThreadFunctions  g_thread_functions_for_glib_use;
+GUTILS_C_VAR gboolean          g_thread_use_default_impl;
+GUTILS_C_VAR gboolean          g_threads_got_initialized;
+
+/* 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
+ */
+#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))
+/* 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);
+
+/* these are some convenience macros that expand to nothing if GLib was
+ * configured with --deisable-threads. for using StaticMutexes, you
+ * declare them with G_LOCK_DECLARE_STATIC (name) or G_LOCK_DECLARE (name)
+ * if you need to export the mutex. 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 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;
+extern void glib_dummy_decl (void);
+#define G_LOCK_NAME(name)              (g__ ## name ## _lock)
+#ifdef G_THREADS_ENABLED
+#  define G_LOCK_DECLARE_STATIC(name)  static G_LOCK_DECLARE (name)
+#  define G_LOCK_DECLARE(name)         \
+    GStaticMutex G_LOCK_NAME (name) = G_STATIC_MUTEX_INIT 
+
+#  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_STMT_START{             \
+        g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,                          \
+              "file %s: line %d (%s): try locking: %s ",         \
+              __FILE__,        __LINE__, G_GNUC_PRETTY_FUNCTION, \
+               #name);                                            \
+     }G_STMT_END,      g_static_mutex_trylock (G_LOCK_NAME (name))
+#  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_DECLARE_STATIC(name)  extern void glib_dummy_decl (void)
+#  define G_LOCK_DECLARE(name)         extern void glib_dummy_decl (void)
+#  define G_LOCK(name)
+#  define G_UNLOCK(name)
+#  define G_TRYLOCK(name)              (FALSE)
+#endif /* !G_THREADS_ENABLED */
 
 #ifdef __cplusplus
 }