* 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
#define __G_STRFUNCS_H__
#include <stdarg.h>
+#include <glib/gmacros.h>
#include <glib/gtypes.h>
G_BEGIN_DECLS
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);
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.
gchar* g_stpcpy (gchar *dest,
const char *src);
-G_CONST_RETURN gchar *g_strip_context (const gchar *msgid,
- const gchar *msgval);
-
-G_CONST_RETURN gchar *g_dgettext (const gchar *domain,
- const gchar *msgid);
-
-G_CONST_RETURN gchar *g_dngettext (const gchar *domain,
- const gchar *msgid,
- const gchar *msgid_plural,
- gulong n);
-G_CONST_RETURN gchar *g_dpgettext (const gchar *domain,
- const gchar *msgctxtid,
- gsize msgidoffset);
-
G_END_DECLS
#endif /* __G_STRFUNCS_H__ */