diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-12-01 04:00:43 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-12-01 04:00:43 +0000 |
| commit | c73767f36200392fdf3a87ed438b83979af09f62 (patch) | |
| tree | f6500b946501ce562cbafe94cd70c05460058d92 /ace/Svc_Conf_l.cpp | |
| parent | 8c6daa78f0e54a9b47630bbe74825cc053bbeed2 (diff) | |
| download | ATCD-c73767f36200392fdf3a87ed438b83979af09f62.tar.gz | |
#include ace/stdcpp.h instead of stdio.h. Changed ECHO to ACE_SVC_CONF_ECHO
Diffstat (limited to 'ace/Svc_Conf_l.cpp')
| -rw-r--r-- | ace/Svc_Conf_l.cpp | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/ace/Svc_Conf_l.cpp b/ace/Svc_Conf_l.cpp index d25b27130bd..627786f8772 100644 --- a/ace/Svc_Conf_l.cpp +++ b/ace/Svc_Conf_l.cpp @@ -1,13 +1,6 @@ // $Id$ #define ACE_BUILD_DLL -#include "ace/config.h" -#if defined (ACE_HAS_TERM_IOCTLS) /* to avoid conflict with sys/termios.h ECHO */ -#undef ACE_HAS_TERM_IOCTLS -#endif /* ACE_HAS_TERM_IOCTLS */ -#if defined (HPUX) || defined (VXWORKS) -#include "ace/OS.h" -#endif /* HPUX || VXWORKS */ /* A lexical scanner generated by flex */ /* Scanner skeleton version: @@ -16,7 +9,7 @@ #define FLEX_SCANNER -#include /**/ <stdio.h> +#include "ace/stdcpp.h" /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ @@ -30,7 +23,7 @@ #ifdef __cplusplus #include /**/ <stdlib.h> -#include /**/ <stdio.h> +#include "ace/stdcpp.h" /* Use prototypes in function declarations. */ #define YY_USE_PROTOS @@ -475,7 +468,7 @@ char *ace_yytext; #include "ace/Svc_Conf.h" #include "ace/Svc_Conf_Tokens.h" -// Keeps track of the current line for debugging output. +// Keeps track of the current line for debugging output. int ace_yylineno = 1; // Keeps track of the number of errors encountered so far. @@ -509,11 +502,11 @@ YY_MALLOC_DECL /* Copy whatever the last rule matched to the standard output. */ -#ifndef ECHO +#ifndef ACE_SVC_CONF_ECHO /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO (void) fwrite( ace_yytext, ace_yyleng, 1, ace_yyout ) +#define ACE_SVC_CONF_ECHO (void) fwrite( ace_yytext, ace_yyleng, 1, ace_yyout ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -757,23 +750,23 @@ YY_USER_ACTION { // Eliminate the opening and closing double quotes *strrchr (ace_yytext, '"') = '\0'; ace_yyleng -= 1; - ace_yylval.ident_ = ace_obstack->copy (ace_yytext + 1, ace_yyleng); + ace_yylval.ident_ = ace_obstack->copy (ace_yytext + 1, ace_yyleng); return token (ACE_STRING); } /* YY_BREAK */ case 20: YY_USER_ACTION # line 57 "Svc_Conf.l" -{ - ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng); - return token (ACE_IDENT); +{ + ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng); + return token (ACE_IDENT); } /* YY_BREAK */ case 21: YY_USER_ACTION # line 61 "Svc_Conf.l" -{ - ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng); - return token (ACE_PATHNAME); +{ + ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng); + return token (ACE_PATHNAME); } /* YY_BREAK */ case 22: @@ -800,7 +793,7 @@ case YY_STATE_EOF(NORMAL): case 25: YY_USER_ACTION # line 69 "Svc_Conf.l" -ECHO; +ACE_SVC_CONF_ECHO; YY_BREAK case YY_END_OF_BUFFER: @@ -1515,6 +1508,6 @@ ace_yywrap (void) { ::fflush (ace_yyin); ace_yytext[0] = '#'; - ace_yyleng = 0; + ace_yyleng = 0; return 1; } |