Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 20:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

* data/c.m4 (b4_c_function_def): Look at __STDC_VERSION__ as well

Browse Source 
as __STDC__, as IBM cc defines the former but not the latter.
* data/yacc.c (YYMODERN_C): New macro, which also looks at
__STDC_VERSION__.  Use it everywhere instead of looking at
__STDC__ and __cplusplus.
This commit is contained in:
Paul Eggert
2005-10-11 05:36:04 +00:00
parent 4f6e011e2e
commit 4d7aa45e75
3 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -7,6 +7,11 @@
* src/scan-gram.l (gram_wrap): Redefine to avoid bug in flex 2.5.31
that xlc complains about.
* src/scan-skel.l (skel_wrap): Likewise.
* data/c.m4 (b4_c_function_def): Look at __STDC_VERSION__ as well
as __STDC__, as IBM cc defines the former but not the latter.
* data/yacc.c (YYMODERN_C): New macro, which also looks at
__STDC_VERSION__. Use it everywhere instead of looking at
__STDC__ and __cplusplus.
2005-10-10 Akim Demaille <akim@epita.fr>

2
data/c.m4
View File

@@ -232,7 +232,7 @@ m4_define([b4_token_enums_defines],
# ----------------------------------------------------------
# Declare the function NAME.
m4_define([b4_c_function_def],
[#if defined (__STDC__) || defined (__cplusplus)
[#if defined (__STDC__) || defined (__STDC_VERSION__) || defined (__cplusplus)
b4_c_ansi_function_def($@)
#else
$2

32
data/yacc.c
View File

@@ -219,12 +219,23 @@ typedef struct YYLTYPE
/* Line __line__ of yacc.c. */
b4_syncline([@oline@], [@ofile@])[
/* Define YYMODERN_C if this compiler supports C89 or better. Some
modern compilers (e.g., IBM xlc 7.0) don't define __STDC__ for
pedantic reasons, but they define __STDC_VERSION__ so check that
as well. Consider a C++ compiler to be modern if it defines
__cplusplus. */
#if defined (__STDC__) || defined (__STDC_VERSION__) || defined (__cplusplus)
# define YYMODERN_C 1
#else
# define YYMODERN_C 0
#endif
#ifndef YYSIZE_T
# if defined (__SIZE_TYPE__)
# define YYSIZE_T __SIZE_TYPE__
# elif defined (size_t)
# define YYSIZE_T size_t
# elif ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus))
# elif ! defined (YYSIZE_T) && YYMODERN_C
# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
# define YYSIZE_T size_t
# else
@@ -266,8 +277,7 @@ b4_syncline([@oline@], [@ofile@])[
# define alloca _alloca
# else
# define YYSTACK_ALLOC alloca
# if (! defined (_ALLOCA_H) && ! defined (_STDLIB_H) \
&& (defined (__STDC__) || defined (__cplusplus)))
# if ! defined (_ALLOCA_H) && ! defined (_STDLIB_H) && YYMODERN_C
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
# ifndef _STDLIB_H
# define _STDLIB_H 1
@@ -298,15 +308,13 @@ extern "C" {
# endif
# ifndef YYMALLOC
# define YYMALLOC malloc
# if (! defined (malloc) && ! defined (_STDLIB_H) \
&& (defined (__STDC__) || defined (__cplusplus)))
# if ! defined (malloc) && ! defined (_STDLIB_H) && YYMODERN_C
void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
# endif
# endif
# ifndef YYFREE
# define YYFREE free
# if (! defined (free) && ! defined (_STDLIB_H) \
&& (defined (__STDC__) || defined (__cplusplus)))
# if ! defined (free) && ! defined (_STDLIB_H) && YYMODERN_C
void free (void *); /* INFRINGES ON USER NAME SPACE */
# endif
# endif
@@ -380,7 +388,7 @@ union yyalloc
#endif
#if defined (__STDC__) || defined (__cplusplus)
#if YYMODERN_C
typedef signed char yysigned_char;
#else
typedef short int yysigned_char;
@@ -711,7 +719,7 @@ int yydebug;
# else
/* Return the length of YYSTR. */
static YYSIZE_T
# if defined (__STDC__) || defined (__cplusplus)
# if YYMODERN_C
yystrlen (const char *yystr)
# else
yystrlen (yystr)
@@ -735,7 +743,7 @@ yystrlen (yystr)
/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
YYDEST. */
static char *
# if defined (__STDC__) || defined (__cplusplus)
# if YYMODERN_C
yystpcpy (char *yydest, const char *yysrc)
# else
yystpcpy (yydest, yysrc)
@@ -921,7 +929,7 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
/* Prevent warnings from -Wmissing-prototypes. */
#ifdef YYPARSE_PARAM
# if defined (__STDC__) || defined (__cplusplus)
# if YYMODERN_C
int yyparse (void *YYPARSE_PARAM);
# else
int yyparse ();
@@ -959,7 +967,7 @@ b4_pure_if([],
`----------*/
#ifdef YYPARSE_PARAM
# if defined (__STDC__) || defined (__cplusplus)
# if YYMODERN_C
int yyparse (void *YYPARSE_PARAM)
# else
int yyparse (YYPARSE_PARAM)