Mercurial > hg > octave-lojdl > gnulib-hg

changeset 13409:7f4981d27433

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: avoid compilation warnings in argmatch and exclude tests... in packages that define ARGMATCH_DIE_DECL, like coreutils. * tests/test-exclude.c [ARGMATCH_DIE_DECL]: Also declare the function. Since it always exits, declare with the "noreturn" attribute. * tests/test-argmatch.c: Likewise.
author Jim Meyering <meyering@redhat.com>
date Fri, 11 Jun 2010 09:50:29 +0200
parents 409615e3437a
children 78e99fa31037
files ChangeLog tests/test-argmatch.c tests/test-exclude.c
diffstat 3 files changed, 28 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-06-11  Jim Meyering  <meyering@redhat.com>
 
+	tests: avoid compilation warnings in argmatch and exclude tests...
+	in packages that define ARGMATCH_DIE_DECL, like coreutils.
+	* tests/test-exclude.c [ARGMATCH_DIE_DECL]: Also declare the function.
+	Since it always exits, declare with the "noreturn" attribute.
+	* tests/test-argmatch.c: Likewise.
+
 	tests: avoid 'const' discard warnings in mbsstr tests
 	* tests/test-mbsstr1.c (main): Add "const" to avoid trivial warning.
 	* tests/test-mbsstr2.c (main): Likewise.
--- a/tests/test-argmatch.c
+++ b/tests/test-argmatch.c
@@ -29,6 +29,17 @@
 /* Some packages define ARGMATCH_DIE and ARGMATCH_DIE_DECL in <config.h>, and
    thus must link with a definition of that function.  Provide it here.  */
 #ifdef ARGMATCH_DIE_DECL
+#ifndef __attribute__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
+#  define __attribute__(x) /* empty */
+# endif
+#endif
+
+#ifndef ATTRIBUTE_NORETURN
+# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+#endif
+
+ARGMATCH_DIE_DECL ATTRIBUTE_NORETURN;
 ARGMATCH_DIE_DECL { exit (1); }
 #endif
 
--- a/tests/test-exclude.c
+++ b/tests/test-exclude.c
@@ -63,6 +63,17 @@
 /* Some packages define ARGMATCH_DIE and ARGMATCH_DIE_DECL in <config.h>, and
    thus must link with a definition of that function.  Provide it here.  */
 #ifdef ARGMATCH_DIE_DECL
+#ifndef __attribute__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
+#  define __attribute__(x) /* empty */
+# endif
+#endif
+
+#ifndef ATTRIBUTE_NORETURN
+# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+#endif
+
+ARGMATCH_DIE_DECL ATTRIBUTE_NORETURN;
 ARGMATCH_DIE_DECL { exit (1); }
 #endif