>From 1db0b5bf95168b776146a40fc020a255496fc881 Mon Sep 17 00:00:00 2001
From: Paul Eggert <address@hidden>
Date: Fri, 2 Sep 2016 15:27:12 -0700
Subject: [PATCH 2/2] 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.
---
 src/dfa.c | 5 +++--
 src/dfa.h | 6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

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.  */
 
-- 
2.7.4