touchups.

touchups.

diff --git a/gcompletion.h b/gcompletion.h
index 6ad6533840b679d3232817bcdb7fa1a1289b4aee..83b243b90ab229894bddb4714ee5cca510e36235 100644 (file)
--- a/gcompletion.h
+++ b/gcompletion.h
@@ -39,7 +39,6 @@ typedef gchar*          (*GCompletionFunc)      (gpointer);
 /* GCompletion
  */
 
-typedef int (*GCompletionStrcmpFunc)(const char *s1, const char *s2);
 typedef int (*GCompletionStrncmpFunc)(const char *s1, const char *s2, size_t n);
 
 struct _GCompletion

diff --git a/glib/gcompletion.h b/glib/gcompletion.h
index 6ad6533840b679d3232817bcdb7fa1a1289b4aee..83b243b90ab229894bddb4714ee5cca510e36235 100644 (file)
--- a/glib/gcompletion.h
+++ b/glib/gcompletion.h
@@ -39,7 +39,6 @@ typedef gchar*          (*GCompletionFunc)      (gpointer);
 /* GCompletion
  */
 
-typedef int (*GCompletionStrcmpFunc)(const char *s1, const char *s2);
 typedef int (*GCompletionStrncmpFunc)(const char *s1, const char *s2, size_t n);
 
 struct _GCompletion

diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index 58f9438c268759cd794648d0c72fed5bc710683e..0160d8c6e82f4cf3d8d61e0d95fd9a37b6878ab7 100644 (file)
--- a/glib/gmarkup.c
+++ b/glib/gmarkup.c
@@ -1263,8 +1263,8 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
                   if (context->parser->start_element)
                     (* context->parser->start_element) (context,
                                                         start_name,
-                                                        (const gchar *)attr_names,
-                                                        (const gchar *)attr_values,
+                                                        (const gchar **)attr_names,
+                                                        (const gchar **)attr_values,
                                                         context->user_data,
                                                         &tmp_error);
 

diff --git a/gmarkup.c b/gmarkup.c
index 58f9438c268759cd794648d0c72fed5bc710683e..0160d8c6e82f4cf3d8d61e0d95fd9a37b6878ab7 100644 (file)
--- a/gmarkup.c
+++ b/gmarkup.c
@@ -1263,8 +1263,8 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
                   if (context->parser->start_element)
                     (* context->parser->start_element) (context,
                                                         start_name,
-                                                        (const gchar *)attr_names,
-                                                        (const gchar *)attr_values,
+                                                        (const gchar **)attr_names,
+                                                        (const gchar **)attr_values,
                                                         context->user_data,
                                                         &tmp_error);