1.1 --- a/bl/bl.h	Fri Jan 27 10:30:16 2012 +0000
     1.2 +++ b/bl/bl.h	Fri Jan 27 16:18:02 2012 +0000
     1.3 @@ -1,36 +1,2 @@
     1.4 -#if HAVE_GLIB
     1.5 -
     1.6 -#include <glib.h>
     1.7 -#define BL_DIR_SEPARATOR G_DIR_SEPARATOR
     1.8 -#define BL_DIR_SEPARATOR_S G_DIR_SEPARATOR_S
     1.9 -#define BL_IS_DIR_SEPARATOR(c) G_IS_DIR_SEPARATOR(c)
    1.10 -#define boolean gboolean
    1.11 -#define String GString
    1.12 -#define mem_new0 g_new0
    1.13 -#define mem_free g_free
    1.14 -#define str_dup g_strdup
    1.15 -#define str_ndup g_strndup
    1.16 -#define path_get_basename g_path_get_basename
    1.17 -#define file_get_contents(filename,contents,length) \
    1.18 -  g_file_get_contents(filename,contents,length,NULL)
    1.19 -#define string_new g_string_new
    1.20 -#define string_append g_string_append
    1.21 -#define string_append_len g_string_append_len
    1.22 -#define string_append_c g_string_append_c
    1.23 -#define string_free g_string_free
    1.24 -#define string_set_size g_string_set_size
    1.25 -
    1.26 -#else	/* !HAVE_GLIB */
    1.27 -
    1.28 -#include <bl/macros.h>
    1.29 -#include <bl/types.h>
    1.30 -#include <bl/mem.h>
    1.31 -#include <bl/fileutils.h>
    1.32 -#include <bl/strfuncs.h>
    1.33 -#include <bl/blstring.h>
    1.34 -#include <bl/utils.h>
    1.35 -
    1.36 -#endif	/* HAVE_GLIB */
    1.37 -
    1.38  #include <bl/textfileutils.h>
    1.39  #include <bl/spawn.h>