diff options
| -rw-r--r-- | lib/autoconf/programs.m4 | 7 | ||||
| -rw-r--r-- | tests/semantics.at | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lib/autoconf/programs.m4 b/lib/autoconf/programs.m4 index 0ad3ddd1..86ba3948 100644 --- a/lib/autoconf/programs.m4 +++ b/lib/autoconf/programs.m4 @@ -727,7 +727,12 @@ b { REJECT; } c { yymore (); } d { yyless (1); } e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument. */ - yyless ((input () != 0)); } +#ifdef __cplusplus + yyless ((yyinput () != 0)); +#else + yyless ((input () != 0)); +#endif + } f { unput (yytext[0]); } . { BEGIN INITIAL; } %% diff --git a/tests/semantics.at b/tests/semantics.at index 98933aa1..32811f6d 100644 --- a/tests/semantics.at +++ b/tests/semantics.at @@ -111,7 +111,7 @@ AT_CHECK_MACRO([AC_CHECK_DECLS], [[AC_CHECK_DECLS([yes, no, myenum, mystruct, myfunc, mymacro1, mymacro2],,, [[extern int yes; enum { myenum }; - extern struct { int x[20]; } mystruct; + extern struct mystruct_s { int x[20]; } mystruct; extern int myfunc(); #define mymacro1(arg) arg #define mymacro2]]) @@ -119,7 +119,7 @@ AT_CHECK_MACRO([AC_CHECK_DECLS], AC_CHECK_DECLS([strerror],,, [[]]) # The difference in space-before-open-paren is intentional. AC_CHECK_DECLS([basenam (char *), dirnam(char *), - [moreargs (char, short, int, long, void *, char [], float, double)]],,, + moreargs (char, short, int, long, void *, char *, float, double)],,, [[#ifdef __cplusplus extern "C++" char *basenam (char *); extern "C++" const char *basenam (const char *); |