Mercurial > gnulib
changeset 9890:1aea88e16967
Avoid compile failure on OS/2.
* lib/regex_internal.h (internal_function): Disable optimization
on OS/2 (__EMX__), where it caused compiler error.
Reported by Elbert Pol.
Signed-off-by: Eric Blake <ebb9@byu.net>
| author | Eric Blake <ebb9@byu.net> |
|---|---|
| date | Fri, 11 Apr 2008 10:22:22 -0600 |
| parents | 0be6f1ab456d |
| children | 03fc23d91d4e |
| files | ChangeLog lib/regex_internal.h |
| diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Apr 11 16:31:39 2008 +0200 +++ b/ChangeLog Fri Apr 11 10:22:22 2008 -0600 @@ -1,7 +1,14 @@ +2008-04-11 Eric Blake <ebb9@byu.net> + + Avoid compile failure on OS/2. + * lib/regex_internal.h (internal_function): Disable optimization + on OS/2 (__EMX__), where it caused compiler error. + Reported by Elbert Pol. + 2008-04-11 Bruno Haible <bruno@clisp.org> Flush the standard error stream before aborting. Needed on netlabs.org - klibc (derived from emx+gcc libc). + klibc (derived from emx+gcc libc) and mingw. * tests/test-argmatch.c (ASSERT): Call fflush(stderr) before abort(). * tests/test-array_list.c (ASSERT): Likewise. * tests/test-array_oset.c (ASSERT): Likewise.
--- a/lib/regex_internal.h Fri Apr 11 16:31:39 2008 +0200 +++ b/lib/regex_internal.h Fri Apr 11 10:22:22 2008 -0600 @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. @@ -421,7 +421,7 @@ typedef struct re_dfa_t re_dfa_t; #ifndef _LIBC -# ifdef __i386__ +# if defined __i386__ && !defined __EMX__ # define internal_function __attribute ((regparm (3), stdcall)) # else # define internal_function