Don't use G_DISABLE_DEPRECATED guards around deprecated functions

[platform/upstream/glib.git] / glib / gstrfuncs.h

diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
index 5c7332a..68c89fd 100644 (file)
--- a/glib/gstrfuncs.h
+++ b/glib/gstrfuncs.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
@@ -103,9 +103,9 @@ gchar*                    g_strdelimit     (gchar        *string,
 gchar*               g_strcanon       (gchar        *string,
                                        const gchar  *valid_chars,
                                        gchar         substitutor);
-G_CONST_RETURN gchar* g_strerror       (gint         errnum) G_GNUC_CONST;
-G_CONST_RETURN gchar* g_strsignal      (gint         signum) G_GNUC_CONST;
-gchar*               g_strreverse     (gchar        *string);
+const gchar *         g_strerror       (gint         errnum) G_GNUC_CONST;
+const gchar *         g_strsignal      (gint         signum) G_GNUC_CONST;
+gchar *                      g_strreverse     (gchar        *string);
 gsize                g_strlcpy        (gchar        *dest,
                                        const gchar  *src,
                                        gsize         dest_size);
@@ -167,22 +167,19 @@ gchar*                g_ascii_strdown     (const gchar *str,
 gchar*                g_ascii_strup       (const gchar *str,
                                           gssize       len) G_GNUC_MALLOC;
 
-#ifndef G_DISABLE_DEPRECATED
 
-/* The following four functions are deprecated and will be removed in
- * the next major release. They use the locale-specific tolower and
- * toupper, which is almost never the right thing.
- */
-
-gint                 g_strcasecmp     (const gchar *s1,
-                                       const gchar *s2);
-gint                 g_strncasecmp    (const gchar *s1,
-                                       const gchar *s2,
-                                       guint        n);
-gchar*               g_strdown        (gchar        *string);
-gchar*               g_strup          (gchar        *string);
+GLIB_DEPRECATED
+gint                  g_strcasecmp     (const gchar *s1,
+                                        const gchar *s2);
+GLIB_DEPRECATED
+gint                  g_strncasecmp    (const gchar *s1,
+                                        const gchar *s2,
+                                        guint        n);
+GLIB_DEPRECATED
+gchar*                g_strdown        (gchar       *string);
+GLIB_DEPRECATED
+gchar*                g_strup          (gchar       *string);
 
-#endif /* G_DISABLE_DEPRECATED */
 
 /* String utility functions that return a newly allocated string which
  * ought to be freed with g_free from the caller at some point.
@@ -245,25 +242,6 @@ guint                 g_strv_length    (gchar       **str_array);
 gchar*                g_stpcpy         (gchar        *dest,
                                         const char   *src);
 
-G_CONST_RETURN gchar *g_strip_context  (const gchar *msgid, 
-                                       const gchar *msgval) G_GNUC_FORMAT(1);
-
-G_CONST_RETURN gchar *g_dgettext       (const gchar *domain,
-                                       const gchar *msgid) G_GNUC_FORMAT(2);
-G_CONST_RETURN gchar *g_dcgettext      (const gchar *domain,
-                                       const gchar *msgid,
-                                        int          category) G_GNUC_FORMAT(2);
-G_CONST_RETURN gchar *g_dngettext      (const gchar *domain,
-                                       const gchar *msgid,
-                                       const gchar *msgid_plural,
-                                       gulong       n) G_GNUC_FORMAT(3);
-G_CONST_RETURN gchar *g_dpgettext      (const gchar *domain,
-                                        const gchar *msgctxtid,
-                                        gsize        msgidoffset) G_GNUC_FORMAT(2);
-G_CONST_RETURN gchar *g_dpgettext2     (const gchar *domain,
-                                        const gchar *context,
-                                        const gchar *msgid) G_GNUC_FORMAT(3);
-
 G_END_DECLS
 
 #endif /* __G_STRFUNCS_H__ */