* src/Config-parse.yy: Remove stray `,' in %token arguments.
* src/Alloc.h (__INT_TO_PTR): Redefine to work around glibc 2.3. * doc/texinfo.tex: New upstream version.
This commit is contained in:
parent
88b6012502
commit
bca9d83c44
5 changed files with 1675 additions and 1146 deletions
|
|
@ -30,6 +30,13 @@
|
|||
|
||||
#ifdef HAVE_OBSTACK_H
|
||||
|
||||
/* GNU libc 2.3's copy of obstack.h uses a definition of __INT_TO_PTR
|
||||
which does not compile in C++. Fortunately it will not override
|
||||
an existing definition. */
|
||||
#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 3
|
||||
# define __INT_TO_PTR(P) ((P) + (char *) 0)
|
||||
#endif
|
||||
|
||||
#include <obstack.h>
|
||||
#include <cstdlib>
|
||||
#include <new>
|
||||
|
|
@ -118,7 +125,7 @@ inline void* ObstackAllocator::alloc(int size)
|
|||
*
|
||||
* ------------------------------------------------------------------------- */
|
||||
{
|
||||
return obstack_alloc(&store, size);
|
||||
return obstack_alloc(&store, size);
|
||||
}
|
||||
|
||||
/* ========================================================================= */
|
||||
|
|
|
|||
|
|
@ -368,7 +368,7 @@ static inline bool isLocked(int option)
|
|||
/* Punctuation symbols. */
|
||||
|
||||
%token CFG_LBRACE CFG_RBRACE CFG_EQUALS
|
||||
%token CFG_BLOCK_ID, CFG_OPTION_ID
|
||||
%token CFG_BLOCK_ID CFG_OPTION_ID
|
||||
|
||||
/* The `unknown' token. */
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue