summaryrefslogtreecommitdiffstats
path: root/gettext-runtime
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@gnu.org>2014-05-11 05:44:35 +0900
committerDaiki Ueno <ueno@gnu.org>2014-05-11 05:45:38 +0900
commit1a68f7d230fa82ad98d53520032779e323a27b5a (patch)
treeef3f89138fcf942942d7471cbd4efa8e6d8d958e /gettext-runtime
parent73e6ca05ebc99bd266497276abc9f4d3ac873d39 (diff)
downloadexternal_gettext-1a68f7d230fa82ad98d53520032779e323a27b5a.zip
external_gettext-1a68f7d230fa82ad98d53520032779e323a27b5a.tar.gz
external_gettext-1a68f7d230fa82ad98d53520032779e323a27b5a.tar.bz2
intl: Define possibly undefined _GL_UNUSED in xsize.c
Diffstat (limited to 'gettext-runtime')
-rw-r--r--gettext-runtime/intl/ChangeLog4
-rw-r--r--gettext-runtime/intl/xsize.c14
2 files changed, 18 insertions, 0 deletions
diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 1d113b2..4ca3e30 100644
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-11 Daiki Ueno <ueno@gnu.org>
+
+ * xsize.c (_GL_UNUSED): Define, if undefined.
+
2014-04-30 Steve Ellcey <sellcey@mips.com> (tiny change)
* loadmsgcat.c (PRI_MACROS_BROKEN) [_LIBC]: Define to 0, if
diff --git a/gettext-runtime/intl/xsize.c b/gettext-runtime/intl/xsize.c
index 4b4914c..87d8add 100644
--- a/gettext-runtime/intl/xsize.c
+++ b/gettext-runtime/intl/xsize.c
@@ -1,3 +1,17 @@
#include <config.h>
+
+/* XSIZE_INLINE can be expanded to _GL_UNUSED, which is defined through
+ a gnulib-tool magic. Define it here so not to require Gnulib. */
+#if defined IN_LIBINTL && !defined GL_UNUSED
+/* Define as a marker that can be attached to declarations that might not
+ be used. This helps to reduce warnings, such as from
+ GCC -Wunused-parameter. */
+# if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
+# define _GL_UNUSED __attribute__ ((__unused__))
+# else
+# define _GL_UNUSED
+# endif
+#endif
+
#define XSIZE_INLINE _GL_EXTERN_INLINE
#include "xsize.h"