projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gmacros.h: add G_GNUC_*_IGNORE_DEPRECATIONS macros for clang
[platform/upstream/glib.git]
/
glib
/
gi18n-lib.h
diff --git
a/glib/gi18n-lib.h
b/glib/gi18n-lib.h
index
0d67017
..
150a268
100644
(file)
--- a/
glib/gi18n-lib.h
+++ b/
glib/gi18n-lib.h
@@
-12,9
+12,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __G_I18N_LIB_H__
*/
#ifndef __G_I18N_LIB_H__
@@
-23,14
+21,16
@@
#include <glib.h>
#include <libintl.h>
#include <glib.h>
#include <libintl.h>
+#include <string.h>
#ifndef GETTEXT_PACKAGE
#ifndef GETTEXT_PACKAGE
-#error You must define GETTEXT_PACKAGE before including gi18n-lib.h.
+#error You must define GETTEXT_PACKAGE before including gi18n-lib.h.
Did you forget to include config.h?
#endif
#endif
-#define _(String)
dgettext (GETTEXT_PACKAGE, String
)
+#define _(String)
((char *) g_dgettext (GETTEXT_PACKAGE, String)
)
#define Q_(String) g_dpgettext (GETTEXT_PACKAGE, String, 0)
#define N_(String) (String)
#define C_(Context,String) g_dpgettext (GETTEXT_PACKAGE, Context "\004" String, strlen (Context) + 1)
#define Q_(String) g_dpgettext (GETTEXT_PACKAGE, String, 0)
#define N_(String) (String)
#define C_(Context,String) g_dpgettext (GETTEXT_PACKAGE, Context "\004" String, strlen (Context) + 1)
+#define NC_(Context, String) (String)
#endif /* __G_I18N_LIB_H__ */
#endif /* __G_I18N_LIB_H__ */