diff options
| author | Miguel de Icaza <miguel@gnome.org> | 2006-10-18 02:15:48 +0400 |
|---|---|---|
| committer | Miguel de Icaza <miguel@gnome.org> | 2006-10-18 02:15:48 +0400 |
| commit | 811594bcf724bb6670ca03e6ccea7f138e01212f (patch) | |
| tree | beba524a8307980eaff31d40ac3fa00c0c6e4094 /eglib | |
| parent | 12f8f07daea0353639e2bee3b37f440077432a2e (diff) | |
Move definitions
svn path=/trunk/mono/; revision=66766
Diffstat (limited to 'eglib')
| -rw-r--r-- | eglib/ChangeLog | 2 | ||||
| -rw-r--r-- | eglib/src/Makefile.am | 1 | ||||
| -rw-r--r-- | eglib/src/glib.h | 2 | ||||
| -rw-r--r-- | eglib/src/gutf8.c | 3 |
4 files changed, 6 insertions, 2 deletions
diff --git a/eglib/ChangeLog b/eglib/ChangeLog index 406a294d976..8f3cb48020b 100644 --- a/eglib/ChangeLog +++ b/eglib/ChangeLog @@ -1,5 +1,7 @@ 2006-10-17 Miguel de Icaza <miguel@novell.com> + * src/glib.h: Move private prototypes elsewhere + * src/glib.h (g_thread_init): Adding missing brace (g_list_next): remove ; from the macro definition. diff --git a/eglib/src/Makefile.am b/eglib/src/Makefile.am index 005d6b0fd3d..35784cd739f 100644 --- a/eglib/src/Makefile.am +++ b/eglib/src/Makefile.am @@ -9,6 +9,7 @@ libeglib_la_SOURCES = \ ghashtable.c \ gmem.c \ gmodule.c \ + gmodule.h \ goutput.c \ gstr.c \ gslist.c \ diff --git a/eglib/src/glib.h b/eglib/src/glib.h index 1f793475ac1..e448f94c6e9 100644 --- a/eglib/src/glib.h +++ b/eglib/src/glib.h @@ -494,9 +494,7 @@ typedef enum { } GConvertError; gunichar2 *g_utf8_to_utf16 (const gchar *str, glong len, glong *items_read, glong *items_written, GError **error); -glong utf8_to_utf16_len (const gchar *str, glong len, glong *items_read, GError **error); gchar *g_utf16_to_utf8 (const gunichar2 *str, glong len, glong *items_read, glong *items_written, GError **error); -glong utf16_to_utf8_len (const gunichar2 *str, glong len, glong *items_read, GError **error); /* * Path diff --git a/eglib/src/gutf8.c b/eglib/src/gutf8.c index a3ebdb4ea77..b195c85c7b4 100644 --- a/eglib/src/gutf8.c +++ b/eglib/src/gutf8.c @@ -12,6 +12,9 @@ gpointer error_quark = "ERROR"; +static glong utf8_to_utf16_len (const gchar *str, glong len, glong *items_read, GError **error); +static glong utf16_to_utf8_len (const gunichar2 *str, glong len, glong *items_read, GError **error); + gpointer g_convert_error_quark () { |