grep branch, master, updated. v2.25-80-gcc006a0

[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  cc006a01ec04d5e40e67d4d0587048ea34880cb1 (commit)
       via  85389c3f14d0a337b4f208ae514e537eddb5f98a (commit)
      from  3c381d05ed984f756f45d21776670fa74e1687ca (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=cc006a01ec04d5e40e67d4d0587048ea34880cb1


commit cc006a01ec04d5e40e67d4d0587048ea34880cb1
Author: Paul Eggert <address@hidden>
Date:   Fri Sep 2 15:27:12 2016 -0700

    dfa: merge xalloc.h changes from Gawk
    
    * src/dfa.h (_GL_ATTRIBUTE_MALLOC): Define here, as other
    Gnulib .h files do.  This is more consistent with Gawk.
    * src/dfa.c: Include xalloc.h, since dfa.h no longer does so.
    Include localeinfo.h later; we don't care about order, but Gawk does.

diff --git a/src/dfa.c b/src/dfa.c
index a1bcece..e009bc6 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -24,8 +24,6 @@
 
 #include "dfa.h"
 
-#include "localeinfo.h"
-
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
@@ -51,6 +49,9 @@
 
 #include <wchar.h>
 
+#include "xalloc.h"
+#include "localeinfo.h"
+
 /* HPUX defines these as macros in sys/param.h.  */
 #ifdef setbit
 # undef setbit
diff --git a/src/dfa.h b/src/dfa.h
index b8c44cc..9787d76 100644
--- a/src/dfa.h
+++ b/src/dfa.h
@@ -22,7 +22,11 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include "xalloc.h" /* for _GL_ATTRIBUTE_MALLOC */
+#if 3 <= __GNUC__
+# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
+#else
+# define _GL_ATTRIBUTE_MALLOC
+#endif
 
 struct localeinfo; /* See localeinfo.h.  */
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=85389c3f14d0a337b4f208ae514e537eddb5f98a


commit cc006a01ec04d5e40e67d4d0587048ea34880cb1
Author: Paul Eggert <address@hidden>
Date:   Fri Sep 2 15:27:12 2016 -0700

    dfa: merge xalloc.h changes from Gawk
    
    * src/dfa.h (_GL_ATTRIBUTE_MALLOC): Define here, as other
    Gnulib .h files do.  This is more consistent with Gawk.
    * src/dfa.c: Include xalloc.h, since dfa.h no longer does so.
    Include localeinfo.h later; we don't care about order, but Gawk does.

diff --git a/src/dfa.c b/src/dfa.c
index a1bcece..e009bc6 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -24,8 +24,6 @@
 
 #include "dfa.h"
 
-#include "localeinfo.h"
-
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
@@ -51,6 +49,9 @@
 
 #include <wchar.h>
 
+#include "xalloc.h"
+#include "localeinfo.h"
+
 /* HPUX defines these as macros in sys/param.h.  */
 #ifdef setbit
 # undef setbit
diff --git a/src/dfa.h b/src/dfa.h
index b8c44cc..9787d76 100644
--- a/src/dfa.h
+++ b/src/dfa.h
@@ -22,7 +22,11 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include "xalloc.h" /* for _GL_ATTRIBUTE_MALLOC */
+#if 3 <= __GNUC__
+# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
+#else
+# define _GL_ATTRIBUTE_MALLOC
+#endif
 
 struct localeinfo; /* See localeinfo.h.  */
 

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

Summary of changes:
 src/dfa.c |   11 +++++++----
 src/dfa.h |    6 +++++-
 2 files changed, 12 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
grep