diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-04-09 11:11:59 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-04-09 11:11:59 +0000 |
| commit | d79a9d3d55e231e85d63c133f85624e464f1941e (patch) | |
| tree | bfd6726ddf65b2c36d980b3147ab746b0a91de45 | |
| parent | a4e770bb2c52b233e644941a2c3fd92bf7cca68f (diff) | |
| download | ATCD-d79a9d3d55e231e85d63c133f85624e464f1941e.tar.gz | |
Wed Apr 9 11:11:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/ace/Svc_Conf_y.cpp | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 810814a9cd8..597696060cb 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Wed Apr 9 11:11:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Svc_Conf_y.cpp: + Fixed unicode build problems + Wed Apr 9 08:06:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Svc_Conf.y: diff --git a/ACE/ace/Svc_Conf_y.cpp b/ACE/ace/Svc_Conf_y.cpp index a8558b95090..53706908414 100644 --- a/ACE/ace/Svc_Conf_y.cpp +++ b/ACE/ace/Svc_Conf_y.cpp @@ -1913,7 +1913,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // messages. void -ace_yyerror (int ace_yyerrno, int ace_yylineno, ACE_TCHAR const * s) +ace_yyerror (int ace_yyerrno, int ace_yylineno, char const * s) { #if defined (ACE_NLOGGING) ACE_UNUSED_ARG (ace_yyerrno); @@ -1922,14 +1922,14 @@ ace_yyerror (int ace_yyerrno, int ace_yylineno, ACE_TCHAR const * s) #endif /* ACE_NLOGGING */ ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE (%P|%t) [error %d] on line %d: %s\n"), + ACE_TEXT ("ACE (%P|%t) [error %d] on line %d: %C\n"), ace_yyerrno, ace_yylineno, s)); } void -ace_yyerror (ACE_TCHAR const * s) +ace_yyerror (char const * s) { ace_yyerror (-1, -1, s); } |