diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2007-07-13 16:54:03 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2007-07-13 16:54:03 +0000 |
| commit | 40bcc83ecd475dd66bae9cd6f23fb8fd6a71d8de (patch) | |
| tree | b05d953f4f1cd0e3c959dee8d70fb135524a67a3 /ACE/ace | |
| parent | 777e5fdb0a7f60ef2bd58cf6fd1f785549b77243 (diff) | |
| download | ATCD-40bcc83ecd475dd66bae9cd6f23fb8fd6a71d8de.tar.gz | |
ChangeLogTag:Fri Jul 13 16:49:31 UTC 2007 Ossama Othman <ossama_othman at symantec dot com>
Diffstat (limited to 'ACE/ace')
| -rw-r--r-- | ACE/ace/Svc_Conf.h | 2 | ||||
| -rw-r--r-- | ACE/ace/Svc_Conf.y | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ACE/ace/Svc_Conf.h b/ACE/ace/Svc_Conf.h index e64678e61c4..a62da127abf 100644 --- a/ACE/ace/Svc_Conf.h +++ b/ACE/ace/Svc_Conf.h @@ -81,7 +81,7 @@ ACE_YY_DECL; extern FILE *ace_yyin; /// Error handling routine required by YACC or BISON -void ace_yyerror (int yyerrno, int yylineno, ACE_TCHAR const *); +void ace_yyerror (int yyerrno, int yylineno, char const *); /// Holds the lexeme for the current token extern ACE_TCHAR *ace_yytext; diff --git a/ACE/ace/Svc_Conf.y b/ACE/ace/Svc_Conf.y index 07b5733674b..87e44928bc2 100644 --- a/ACE/ace/Svc_Conf.y +++ b/ACE/ace/Svc_Conf.y @@ -319,7 +319,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // messages. void -yyerror (int yyerrno, int yylineno, ACE_TCHAR const * s) +yyerror (int yyerrno, int yylineno, char const * s) { #if defined (ACE_NLOGGING) ACE_UNUSED_ARG (yyerrno); @@ -331,7 +331,7 @@ yyerror (int yyerrno, int yylineno, ACE_TCHAR const * s) ACE_LIB_TEXT ("ACE (%P|%t) [error %d] on line %d: %s\n"), yyerrno, yylineno, - s)); + ACE_TEXT_CHAR_TO_TCHAR (s))); } // Note that SRC_REC represents left context, which is the STREAM * |