Update the TODO

svn path=/trunk/mono/; revision=64178

diff --git a/eglib/TODO b/eglib/TODO
index ff33750a19bb802b8f1dda75d1d4668cac6e9c7c..9eda41febc3f8eac07d3809f4e80ddc24b18c42c 100644 (file)
--- a/eglib/TODO
+++ b/eglib/TODO
@@ -21,7 +21,6 @@
 
 Routines missing from eglib, by count number:
 
-     29 g_getenv
      27 g_build_filename
      24 g_utf16_to_utf8
      21 g_snprintf
@@ -40,7 +39,6 @@ Routines missing from eglib, by count number:
       5 g_newa
       5 g_get_current_dir
       5 g_file_get_contents
-      4 g_unsetenv
       4 g_strdown
       4 g_get_tmp_dir
       3 g_utf8_validate
@@ -48,7 +46,6 @@ Routines missing from eglib, by count number:
       3 g_thread_init
       3 g_spaced_primes_closest
       3 g_shell_quote
-      3 g_setenv
       3 g_locale_to_utf8
       3 g_list_insert_before
       3 g_file_open_tmp
@@ -59,8 +56,6 @@ Routines missing from eglib, by count number:
       2 g_strdelimit
       2 g_shell_parse_argv
       2 g_set_prgname
-      2 g_queue_pop_head
-      2 g_queue_is_empty
       2 g_printerr
       2 g_pattern_spec_new
       2 g_pattern_spec_free
@@ -85,9 +80,6 @@ Routines missing from eglib, by count number:
       1 g_source_remove
       1 g_source_attach
       1 g_shell_unquote
-      1 g_queue_push_head
-      1 g_queue_new
-      1 g_queue_free
       1 g_mem_set_vtable
       1 g_main_loop_run
       1 g_main_context_new
@@ -109,8 +101,6 @@ Routines missing from eglib, by count number:
       1 g_ascii_strdown
 
 Macros:
-     40 G_GSIZE_FORMAT
-      9 G_GUINT64_FORMAT
       7 G_FILE_TEST_IS_DIR
       6 G_UNLIKELY
       4 G_LIKELY

diff --git a/eglib/configure.ac b/eglib/configure.ac
index a016d731763ee50090f82196091620174e73713b..347375d477232a1224158ded1918c30865698670 100644 (file)
--- a/eglib/configure.ac
+++ b/eglib/configure.ac
@@ -58,6 +58,7 @@ if test $ac_cv_sizeof_void_p != $ac_cv_sizeof_int; then
    GUINT_TO_POINTER="((gpointer)(gulong) (v))"
    GSIZE="long"
    GSIZE_FORMAT='"lu"'
+   G_GUINT64_FORMAT='"lu"'
 else
    GPOINTER_TO_INT="((gint) (ptr))"
    GPOINTER_TO_UINT="((guint) (ptr))"
@@ -65,6 +66,7 @@ else
    GUINT_TO_POINTER="((gpointer) (v))"
    GSIZE="int"
    GSIZE_FORMAT='"u"'
+   G_GUINT64_FORMAT='"llu"'
 fi
 AC_SUBST(GPOINTER_TO_INT)
 AC_SUBST(GPOINTER_TO_UINT)
@@ -72,6 +74,7 @@ AC_SUBST(GINT_TO_POINTER)
 AC_SUBST(GUINT_TO_POINTER)
 AC_SUBST(GSIZE)
 AC_SUBST(GSIZE_FORMAT)
+AC_SUBST(G_GUINT64_FORMAT)
 
 AC_OUTPUT([
 Makefile

diff --git a/eglib/src/eglib-config.h.in b/eglib/src/eglib-config.h.in
index 8aeea45a3baf3035a6730e1f08868c3ca4580ecc..eaeb9c8e17872c5653d14deedf91f1d6abeee5db 100644 (file)
--- a/eglib/src/eglib-config.h.in
+++ b/eglib/src/eglib-config.h.in
@@ -18,4 +18,5 @@
 typedef unsigned @GSIZE@ gsize;
 typedef signed   @GSIZE@ gssize;
 
-#define G_GSIZE_FORMAT @GSIZE_FORMAT@
+#define G_GSIZE_FORMAT   @GSIZE_FORMAT@
+#define G_GUINT64_FORMAT @G_GUINT64_FORMAT@

diff --git a/eglib/src/glib.h b/eglib/src/glib.h
index ca63da54c7a03d28d1abad5e9ad2ce59b5cc2b28..6d4cab50f9d7c0230f7fb9c34f31e89618a940be 100644 (file)
--- a/eglib/src/glib.h
+++ b/eglib/src/glib.h
@@ -405,4 +405,7 @@ GUnicodeType   g_unichar_type    (gunichar c);
 #define MAX(a,b) (((a)>(b)) ? (a) : (b))
 #endif
 
+/* FIXME: Implement these two for gcc */
+#define G_LIKELY(x) (x)
+#define G_UNLIKELY(x) (x)
 #endif