diff options
author | Jose <jose@zeroc.com> | 2014-10-08 19:59:36 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2014-10-08 19:59:36 +0200 |
commit | dcf16124184f2c5b2b5e569005ae927012eaf8e7 (patch) | |
tree | caa14c9da374d65cf50e0d146895472e0cd28134 /cpp/src/IceGrid/Scanner.cpp | |
parent | Added expect script for IceGRid/customLoadBalac=ncing demo (diff) | |
download | ice-dcf16124184f2c5b2b5e569005ae927012eaf8e7.tar.bz2 ice-dcf16124184f2c5b2b5e569005ae927012eaf8e7.tar.xz ice-dcf16124184f2c5b2b5e569005ae927012eaf8e7.zip |
Regenerate bison/flex files to use correct versions
Diffstat (limited to 'cpp/src/IceGrid/Scanner.cpp')
-rw-r--r-- | cpp/src/IceGrid/Scanner.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/Scanner.cpp b/cpp/src/IceGrid/Scanner.cpp index 45fded5ae27..442e3a6697c 100644 --- a/cpp/src/IceGrid/Scanner.cpp +++ b/cpp/src/IceGrid/Scanner.cpp @@ -1,4 +1,4 @@ -#include "IceUtil/ScannerConfig.h" +#include <IceUtil/ScannerConfig.h> #line 3 "lex.yy.c" @@ -612,7 +612,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO fwrite( yytext, yyleng, 1, yyout ) +#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -623,7 +623,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - int n; \ + unsigned n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ |