grep branch, master, updated. v2.10-80-g3732fd2

[Paul Eggert]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  3732fd2b98692a1e58fa7254fc0cacab8136fb11 (commit)
      from  23c3e9cc24c7b20b55e3fa67c4d1fd599abc6e1a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=3732fd2b98692a1e58fa7254fc0cacab8136fb11


commit 3732fd2b98692a1e58fa7254fc0cacab8136fb11
Author: Paul Eggert <address@hidden>
Date:   Sun Feb 26 11:28:37 2012 -0800

    maint: use gnulib _Noreturn rather than __attribute__ ((noreturn))
    
    * src/grep.h (__attribute__): Remove.
    * src/dfa.h (__attribute__): Likewise.
    (dfaerror): Use noreturn rather than __attribute__ ((noreturn)).
    * src/main.c (usage): Likewise.

diff --git a/src/dfa.h b/src/dfa.h
index 17a4778..351a470 100644
--- a/src/dfa.h
+++ b/src/dfa.h
@@ -18,10 +18,6 @@
 
 /* Written June, 1988 by Mike Haertel */
 
-#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 6) || __STRICT_ANSI__
-# define __attribute__(x)
-#endif
-
 /* Element of a list of strings, at least one of which is known to
    appear in any R.E. matching the DFA. */
 struct dfamust
@@ -99,4 +95,4 @@ extern void dfawarn (const char *);
 /* dfaerror() is called by the regexp routines whenever an error occurs.  It
    takes a single argument, a NUL-terminated string describing the error.
    The user must supply a dfaerror.  */
-extern void dfaerror (const char *) __attribute__ ((noreturn));
+extern _Noreturn void dfaerror (const char *);
diff --git a/src/grep.h b/src/grep.h
index 744a889..f5ab8bf 100644
--- a/src/grep.h
+++ b/src/grep.h
@@ -20,10 +20,6 @@
 #ifndef GREP_GREP_H
 #define GREP_GREP_H 1
 
-#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 6) || __STRICT_ANSI__
-# define __attribute__(x)
-#endif
-
 /* Function pointer types.  */
 typedef void (*compile_fp_t) (char const *, size_t);
 typedef size_t (*execute_fp_t) (char const *, size_t, size_t *, char const *);
diff --git a/src/main.c b/src/main.c
index e593871..6151cac 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1432,7 +1432,7 @@ grepdir (char const *dir, struct stats const *stats)
   return status;
 }
 
-void usage (int status) __attribute__ ((noreturn));
+_Noreturn void usage (int);
 void
 usage (int status)
 {

-----------------------------------------------------------------------

Summary of changes:
 src/dfa.h  |    6 +-----
 src/grep.h |    4 ----
 src/main.c |    2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
grep