Subject: bug#17157: closed (Re: bug#17157: [PATCH 1/5] Partially revert "dfa: improve port to freestanding DJGPP")

From: [email-masked] (GNU bug Tracking System)
Date: Sat, 05 Apr 2014 23:37:03 +0000

Your bug report

#17157: [PATCH 1/5] Partially revert "dfa: improve port to freestanding DJGPP"

which was filed against the grep package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
17157: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17157
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: bug#17157: [PATCH 1/5] Partially revert "dfa: improve port to freestanding DJGPP"
From: Paul Eggert <[email-masked]>
To: Jim Meyering <[email-masked]>
Cc: Paolo Bonzini <[email-masked]>, Aharon Robbins <[email-masked]>, [email-masked]
Date: Sat, 05 Apr 2014 16:36:20 -0700
List-Id: <debbugs-submit.debbugs.gnu.org>

Jim Meyering wrote:
> Thanks!  The grep changes all look fine.

OK, thanks, I installed them and am marking this bug as done.  As I 
understand it, Aharon is in the middle of a gawk release and so now's 
not a good time to install the gawk changes, but we can address any 
integration issues if they later come up.

Subject: [PATCH 1/5] Partially revert "dfa: improve port to freestanding DJGPP"
From: Paolo Bonzini <[email-masked]>
To: [email-masked]
Cc: [email-masked]
Date: Tue, 1 Apr 2014 11:18:42 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

This partially reverts the following commits:
- df6da5d40a47abbc6e3451cb9fab7a8c9ede12cc.
- c40e7f7158109985b901ae67e5faa06160547471.
- 0995fc11214ebbb1c99a4b6d675fe615b0ed8539.

As far as grep is concerned, the #define *does* belong in gnulib.  gawk
can apply the fix in a common header file like grep's src/system.h.
---
 src/dfa.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/dfa.c b/src/dfa.c
index b22fe97..a7f0056 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -34,11 +34,7 @@
 #include <locale.h>
 #include <stdbool.h>
 
-/* Gawk doesn't use Gnulib, so don't assume that setlocale and
-   static_assert are present.  */
-#ifndef LC_ALL
-# define setlocale(category, locale) NULL
-#endif
+/* Gawk doesn't use Gnulib, so don't assume static_assert is present.  */
 #ifndef static_assert
 # define static_assert(cond, diagnostic) \
     extern int (*foo (void)) [!!sizeof (struct { int foo: (cond) ? 8 : -1; })]
-- 
1.9.0