Add

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

diff --git a/eglib/src/eglib-config.h.in b/eglib/src/eglib-config.h.in
new file mode 100644 (file)
index 0000000..a3f566c
--- /dev/null
+++ b/eglib/src/eglib-config.h.in
@@ -0,0 +1,11 @@
+/*
+ * System-dependent settings
+ */
+#define G_GNUC_PRETTY_FUNCTION   @GNUC_PRETTY@
+#define G_GNUC_UNUSED            @GNUC_UNUSED@
+#define G_BYTE_ORDER             @ORDER@
+#define G_GNUC_NORETURN          @GNUC_NORETURN@
+#define G_SEARCHPATH_SEPARATOR_S "@SEARCHSEP@"
+#define G_DIR_SEPARATOR          '@PATHSEP@'
+#define G_DIR_SEPARATOR_S        "@PATHSEP@"
+#define G_BREAKPOINT             @BREAKPOINT@

diff --git a/eglib/src/glib.h b/eglib/src/glib.h
index ccd8732906dfaa02e65f2d1df78a8496f28306f8..0f1bf815b2e73c374827a0e03af39a4ba9983a2a 100644 (file)
--- a/eglib/src/glib.h
+++ b/eglib/src/glib.h
@@ -178,11 +178,11 @@ GSList *g_slist_last      (GSList *list);
 GSList *g_slist_find      (GSList *list, gconstpointer data);
 GSList *g_slist_remove    (GSList *list, gconstpointer data);
 GSList *g_slist_reverse   (GSList *list);
+guint  g_slist_length     (GSList *list);
 GSList *g_slist_remove_link (GSList *list, GSList *link);
 GSList *g_slist_delete_link (GSList *list, GSList *link);
 GSList *g_slist_insert_sorted (GSList *list, gpointer data, GCompareFunc func);
-guint  g_slist_length     (GSList *list);
-#define g_slist_next (slist) ((slist) ? (((GSList *) slist)->next) : NULL)
+#define g_slist_next (slist) ((slist) ? (((GSList *) (slist))->next) : NULL)
 
 /*
  * Pointer Array
@@ -206,7 +206,7 @@ void       g_ptr_array_sort_with_data     (GPtrArray *array, GCompareDataFunc co
 void       g_ptr_array_set_size           (GPtrArray *array, gint length);
 gpointer  *g_ptr_array_free               (GPtrArray *array, gboolean free_seg);
 void       g_ptr_array_foreach            (GPtrArray *array, GFunc func, gpointer user_data);
-#define    g_ptr_array_index(array,index) array->pdata[index]
+#define    g_ptr_array_index(array,index) (array)->pdata[(index)]
 
 
 /*

diff --git a/eglib/src/gstring.c b/eglib/src/gstring.c
index b47905123d398e5619203ea807f025cab49cad0f..eb12a203e7201d9cbf0d1b75cfcb3fabeabe4d59 100644 (file)
--- a/eglib/src/gstring.c
+++ b/eglib/src/gstring.c
@@ -212,3 +212,7 @@ g_string_printf (GString *string, const gchar *format, ...)
        string->allocated_len = string->len+1;
 }
 
+GString *
+g_string_truncate (GString *string, gsize len)
+{
+}