bug-grep
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: grep-2.9.69-f91c on MSVC 9


From: Jim Meyering
Subject: Re: grep-2.9.69-f91c on MSVC 9
Date: Sat, 12 Nov 2011 10:07:11 +0100

Bruno Haible wrote:
> Jim Meyering wrote:
>> > Also, in pcresearch.c the definition of Pexecute does not have the same
>> > declspecs as the declaration in search.h:54. A similar fix as for
>> > obstack.c should work.
>>
>> Can you post a patch?
>
> Actually it's not a terribly good idea to have a 'noreturn' attribute
> depend on the configuration. In this case, the function 'Pexecute' is
> never called directly, only its function pointer is stored in a
> table cell where it will never be fetched.
>
> Here's a proposed patch. I verified that on Linux, it produces no
> warning with --disable-perl-regexp --enable-gcc-warnings.
>
> 2011-11-11  Bruno Haible  <address@hidden>
>
>       Fix compilation error on MSVC 9 to due Pexecute() declaration.
>       * src/pcresearch.c (WITHOUT_PCRE_NORETURN): Remove macro.
>       (Pexecute): Replace abort() call with code that does not trigger GCC
>       warnings.

Thanks, applied with this change to avoid a make syntax-check failure
due to the unmarked diagnostic:

diff --git a/src/pcresearch.c b/src/pcresearch.c
index 5864393..7b865f5 100644
--- a/src/pcresearch.c
+++ b/src/pcresearch.c
@@ -107,7 +107,7 @@ Pexecute (char const *buf, size_t size, size_t *match_size,
 {
 #if !HAVE_LIBPCRE
   /* We can't get here, because Pcompile would have been called earlier.  */
-  error (EXIT_TROUBLE, 0, "abort");
+  error (EXIT_TROUBLE, 0, _("internal error"));
   return -1;
 #else
   /* This array must have at least two elements; everything after that



reply via email to

[Prev in Thread] Current Thread [Next in Thread]