mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2025-02-11 13:51:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix more bugs in specific tests under AC_LANG(C++).

Browse Source 
Found by exhaustive testing for differences between probe results
under AC_LANG(C) and AC_LANG(C++).

 * lib/autoconf/c.m4 (AC_C_FLEXIBLE_ARRAY_MEMBER): Cast result of
   malloc for C++ compatibility.
 * lib/autoconf/programs.m4 (_AC_PROG_LEX_YYTEXT_DECL): Declare yywrap
   as extern "C" when compiling as C++.
This commit is contained in:
Zack Weinberg 2020-11-09 13:08:13 -05:00
parent 8e54013958
commit a8b69e68aa
No known key found for this signature in database
GPG Key ID: 384F8E68AC65B0D5
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/autoconf/c.m4
View File

@ -1993,8 +1993,8 @@ AC_DEFUN([AC_C_FLEXIBLE_ARRAY_MEMBER],
#include <stddef.h> #include <stddef.h>
struct s { int n; double d[]; };]], struct s { int n; double d[]; };]],
[[int m = getchar (); [[int m = getchar ();
struct s *p = malloc (offsetof (struct s, d) struct s *p = (struct s *) malloc (offsetof (struct s, d)
+ m * sizeof (double)); + m * sizeof (double));
p->d[0] = 0.0; p->d[0] = 0.0;
return p->d != (double *) NULL;]])], return p->d != (double *) NULL;]])],
[ac_cv_c_flexmember=yes], [ac_cv_c_flexmember=yes],

3
lib/autoconf/programs.m4
View File

@ -747,6 +747,9 @@ fi])])
AC_DEFUN([_AC_PROG_LEX_YYTEXT_DECL], AC_DEFUN([_AC_PROG_LEX_YYTEXT_DECL],
[cat >conftest.l <<_ACEOF[ [cat >conftest.l <<_ACEOF[
%{ %{
#ifdef __cplusplus
extern "C"
#endif
int yywrap(void); int yywrap(void);
%} %}
%% %%