projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify code that uses g_queue_insert_before() and insert_after()
[platform/upstream/glib.git]
/
glib
/
glibintl.h
diff --git
a/glib/glibintl.h
b/glib/glibintl.h
index
8e6cdf0
..
4f2e58b
100644
(file)
--- a/
glib/glibintl.h
+++ b/
glib/glibintl.h
@@
-5,7
+5,11
@@
#error "config.h must be included prior to glibintl.h"
#endif
#error "config.h must be included prior to glibintl.h"
#endif
-G_CONST_RETURN gchar *glib_gettext (const gchar *str);
+GLIB_AVAILABLE_IN_ALL
+const gchar * glib_gettext (const gchar *str) G_GNUC_FORMAT(1);
+GLIB_AVAILABLE_IN_ALL
+const gchar * glib_pgettext (const gchar *msgctxtid,
+ gsize msgidoffset) G_GNUC_FORMAT(1);
#ifdef ENABLE_NLS
#ifdef ENABLE_NLS
@@
-13,6
+17,7
@@
G_CONST_RETURN gchar *glib_gettext (const gchar *str);
#define _(String) glib_gettext(String)
/* Split out this in the code, but keep it in the same domain for now */
#define P_(String) glib_gettext(String)
#define _(String) glib_gettext(String)
/* Split out this in the code, but keep it in the same domain for now */
#define P_(String) glib_gettext(String)
+#define C_(Context,String) glib_pgettext (Context "\004" String, strlen (Context) + 1)
#ifdef gettext_noop
#define N_(String) gettext_noop(String)
#ifdef gettext_noop
#define N_(String) gettext_noop(String)
@@
-23,11
+28,14
@@
G_CONST_RETURN gchar *glib_gettext (const gchar *str);
#define _(String) (String)
#define N_(String) (String)
#define P_(String) (String)
#define _(String) (String)
#define N_(String) (String)
#define P_(String) (String)
-#define textdomain(String) (String)
+#define C_(Context,String) (String)
+#define textdomain(String) ((String) ? (String) : "messages")
#define gettext(String) (String)
#define dgettext(Domain,String) (String)
#define dcgettext(Domain,String,Type) (String)
#define gettext(String) (String)
#define dgettext(Domain,String) (String)
#define dcgettext(Domain,String,Type) (String)
+#define dngettext(Domain,String1,String2,N) ((N) == 1 ? (String1) : (String2))
#define bindtextdomain(Domain,Directory) (Domain)
#define bindtextdomain(Domain,Directory) (Domain)
+#define bind_textdomain_codeset(Domain,Codeset)
#endif
/* not really I18N-related, but also a string marker macro */
#endif
/* not really I18N-related, but also a string marker macro */