ChangeLogTag: Fri Mar 18 06:52:59 2005 Chad Elliott <elliott_c@ociweb.com>

2 files changed, 81 insertions, 905 deletions

diff --git a/etc/Svc_Conf_l.cpp.diff b/etc/Svc_Conf_l.cpp.diff
index ca25ce02b0c..4b6f1ece873 100644
--- a/etc/Svc_Conf_l.cpp.diff
+++ b/etc/Svc_Conf_l.cpp.diff
@@ -1,186 +1,32 @@
---- Svc_Conf_l.cpp.old	2002-07-30 08:50:08.000000000 -0700
-+++ Svc_Conf_l.cpp	2002-07-30 08:46:46.000000000 -0700
-@@ -1,3 +1,5 @@
-+#define ACE_YY_NO_UNPUT
-+
- /* A lexical scanner generated by flex */
- 
- /* Scanner skeleton version:
-@@ -8,9 +10,6 @@
- #define ACE_YY_FLEX_MAJOR_VERSION 2
- #define ACE_YY_FLEX_MINOR_VERSION 5
- 
--#include /**/ "ace/OS.h"
--#include /**/ <errno.h>
--
- /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
- #ifdef c_plusplus
- #ifndef __cplusplus
-@@ -21,10 +20,8 @@
- 
- #ifdef __cplusplus
- 
--#include /**/ <stdlib.h>
--#ifndef _WIN32
--#include /**/ "ace/OS.h"
--#endif
-+#include "ace/OS.h"
-+#include "ace/Object_Manager.h"
- 
- /* Use prototypes in function declarations. */
- #define ACE_YY_USE_PROTOS
-@@ -42,6 +39,8 @@
- #endif	/* __STDC__ */
- #endif	/* ! __cplusplus */
- 
-+#if (ACE_USES_CLASSIC_SVC_CONF == 1)
-+
- #ifdef __TURBOC__
-  #pragma warn -rch
-  #pragma warn -use
-@@ -134,7 +133,9 @@
- 		} \
- 	while ( 0 )
- 
-+#if 0
- #define unput(c) ace_yyunput( c, ace_yytext_ptr )
-+#endif /* 0 */
- 
- /* The following is because we cannot portably get our hands on size_t
-  * (without autoconf's help, which isn't available because we want
-@@ -147,8 +148,8 @@
- 	{
- 	FILE *ace_yy_input_file;
- 
--	char *ace_yy_ch_buf;		/* input buffer */
--	char *ace_yy_buf_pos;		/* current position in input buffer */
-+	ACE_TCHAR *ace_yy_ch_buf;	/* input buffer */
-+	ACE_TCHAR *ace_yy_buf_pos;	/* current position in input buffer */
- 
- 	/* Size of input buffer in bytes, not including room for EOB
- 	 * characters.
-@@ -210,7 +211,7 @@
- 
- 
- /* ace_yy_hold_char holds the character lost when ace_yytext is formed. */
--static char ace_yy_hold_char;
-+static ACE_TCHAR ace_yy_hold_char;
- 
- static int ace_yy_n_chars;		/* number of characters read into ace_yy_ch_buf */
- 
-@@ -218,7 +219,7 @@
- int ace_yyleng;
- 
- /* Points to current character in buffer. */
--static char *ace_yy_c_buf_p = (char *) 0;
-+static ACE_TCHAR *ace_yy_c_buf_p = (ACE_TCHAR *) 0;
- static int ace_yy_init = 1;		/* whether we need to initialize */
- static int ace_yy_start = 0;	/* start state number */
- 
-@@ -237,9 +238,9 @@
- void ace_yy_flush_buffer ACE_YY_PROTO(( ACE_YY_BUFFER_STATE b ));
- #define ACE_YY_FLUSH_BUFFER ace_yy_flush_buffer( ace_yy_current_buffer )
- 
--ACE_YY_BUFFER_STATE ace_yy_scan_buffer ACE_YY_PROTO(( char *base, ace_yy_size_t size ));
--ACE_YY_BUFFER_STATE ace_yy_scan_string ACE_YY_PROTO(( ace_yyconst char *ace_yy_str ));
--ACE_YY_BUFFER_STATE ace_yy_scan_bytes ACE_YY_PROTO(( ace_yyconst char *bytes, int len ));
-+ACE_YY_BUFFER_STATE ace_yy_scan_buffer ACE_YY_PROTO(( ACE_TCHAR *base, ace_yy_size_t size ));
-+ACE_YY_BUFFER_STATE ace_yy_scan_string ACE_YY_PROTO(( ace_yyconst ACE_TCHAR *ace_yy_str ));
-+ACE_YY_BUFFER_STATE ace_yy_scan_bytes ACE_YY_PROTO(( ace_yyconst ACE_TCHAR *bytes, int len ));
- 
- static void *ace_yy_flex_alloc ACE_YY_PROTO(( ace_yy_size_t ));
- static void *ace_yy_flex_realloc ACE_YY_PROTO(( void *, ace_yy_size_t ));
-@@ -263,16 +264,16 @@
- 
- #define ACE_YY_AT_BOL() (ace_yy_current_buffer->ace_yy_at_bol)
- 
--typedef unsigned char ACE_YY_CHAR;
-+typedef ACE_TCHAR ACE_YY_CHAR;
- FILE *ace_yyin = (FILE *) 0, *ace_yyout = (FILE *) 0;
- typedef int ace_yy_state_type;
--extern char *ace_yytext;
-+extern ACE_TCHAR *ace_yytext;
- #define ace_yytext_ptr ace_yytext
- 
- static ace_yy_state_type ace_yy_get_previous_state ACE_YY_PROTO(( void ));
- static ace_yy_state_type ace_yy_try_NUL_trans ACE_YY_PROTO(( ace_yy_state_type current_state ));
- static int ace_yy_get_next_buffer ACE_YY_PROTO(( void ));
--static void ace_yy_fatal_error ACE_YY_PROTO(( ace_yyconst char msg[] ));
-+static void ace_yy_fatal_error ACE_YY_PROTO(( ace_yyconst ACE_TCHAR msg[] ));
- 
- /* Done after the current pattern has been matched and before the
-  * corresponding action - sets up ace_yytext.
-@@ -492,7 +493,7 @@
-     } ;
- 
- static ace_yy_state_type ace_yy_last_accepting_state;
--static char *ace_yy_last_accepting_cpos;
-+static ACE_TCHAR *ace_yy_last_accepting_cpos;
- 
- /* The intent behind this definition is that it'll catch
-  * any uses of REJECT which flex missed.
-@@ -501,7 +502,7 @@
- #define ace_yymore() ace_yymore_used_but_not_detected
- #define ACE_YY_MORE_ADJ 0
- #define ACE_YY_RESTORE_ACE_YY_MORE_OFFSET
--char *ace_yytext;
-+ACE_TCHAR *ace_yytext;
- #define INITIAL 0
- // $Id: Svc_Conf.l,v 4.19 2002/04/26 19:06:26 elliott_c Exp $
- // Sample lexical analysis for regular expression subset.  Must be
-@@ -535,15 +536,15 @@
- #endif
- 
- #ifndef ACE_YY_NO_UNPUT
--static void ace_yyunput ACE_YY_PROTO(( int c, char *buf_ptr ));
-+static void ace_yyunput ACE_YY_PROTO(( int c, ACE_TCHAR *buf_ptr ));
- #endif
- 
- #ifndef ace_yytext_ptr
--static void ace_yy_flex_strncpy ACE_YY_PROTO(( char *, ace_yyconst char *, int ));
-+static void ace_yy_flex_strncpy ACE_YY_PROTO(( ACE_TCHAR *, ace_yyconst ACE_TCHAR *, int ));
- #endif
- 
- #ifdef ACE_YY_NEED_STRLEN
--static int ace_yy_flex_strlen ACE_YY_PROTO(( ace_yyconst char * ));
-+static int ace_yy_flex_strlen ACE_YY_PROTO(( ace_yyconst ACE_TCHAR * ));
- #endif
- 
- #ifndef ACE_YY_NO_INPUT
-@@ -613,21 +614,21 @@
- 		int c = '*', n; \
- 		for ( n = 0; n < max_size && \
- 			     (c = getc( ace_yyin )) != EOF && c != '\n'; ++n ) \
--			buf[n] = (char) c; \
-+			buf[n] = (ACE_TCHAR) c; \
- 		if ( c == '\n' ) \
--			buf[n++] = (char) c; \
-+			buf[n++] = (ACE_TCHAR) c; \
- 		if ( c == EOF && ferror( ace_yyin ) ) \
--			ACE_YY_FATAL_ERROR( "input in flex scanner failed" ); \
-+			ACE_YY_FATAL_ERROR( ACE_LIB_TEXT ("input in flex scanner failed") ); \
- 		result = n; \
- 		} \
- 	else \
- 		{ \
- 		errno=0; \
--		while ( (result = fread(buf, 1, max_size, ace_yyin))==0 && ferror(ace_yyin)) \
-+		while ( (result = fread(buf, sizeof (ACE_TCHAR), max_size, ace_yyin))==0 && ferror(ace_yyin)) \
- 			{ \
- 			if( errno != EINTR) \
- 				{ \
--				ACE_YY_FATAL_ERROR( "input in flex scanner failed" ); \
-+				ACE_YY_FATAL_ERROR( ACE_LIB_TEXT ("input in flex scanner failed") ); \
- 				break; \
- 				} \
- 			errno=0; \
-@@ -682,11 +683,15 @@
- ACE_YY_DECL
- 	{
- 	register ace_yy_state_type ace_yy_current_state;
--	register char *ace_yy_cp, *ace_yy_bp;
-+	register ACE_TCHAR *ace_yy_cp=0, *ace_yy_bp=0;
- 	register int ace_yy_act;
+--- Svc_Conf_l.cpp.old	Tue Mar  1 10:03:28 2005
++++ Svc_Conf_l.cpp	Tue Mar  1 10:18:29 2005
+@@ -625,9 +625,21 @@
+                         ACE_YY_FATAL_ERROR( "input in flex scanner failed" ); \
+                 result = n; \
+                 } \
+-        else if ( ((result = fread( buf, 1, max_size, ace_yyin )) == 0) \
++        else \
++                { \
++                errno = 0; \
++                while ( ((result = fread( buf, sizeof (ACE_TCHAR), max_size, ace_yyin )) == 0) \
+                   && ferror( ace_yyin ) ) \
+-                ACE_YY_FATAL_ERROR( "input in flex scanner failed" );
++                        { \
++                        if (errno != EINTR) \
++                                { \
++                                ACE_YY_FATAL_ERROR( "input in flex scanner failed" ); \
++                                break; \
++                                } \
++                        errno = 0; \
++                        clearerr(ace_yyin); \
++                        } \
++                }
+ #endif
+ 
+ /* No semi-colon after return; correct usage is to write "ace_yyterminate();" -
+@@ -679,8 +691,12 @@
+         register ACE_TCHAR *ace_yy_cp = 0, *ace_yy_bp = 0;
+         register int ace_yy_act;
  
 +        ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX,
 +                                  ace_mon,
@@ -190,452 +36,119 @@
 -
 +        ACE_Svc_Conf_Lexer_Guard ace_lexer_guard (ACE_SVC_CONF_PARAM);
  
- 	if ( ace_yy_init )
- 		{
-@@ -780,71 +785,71 @@
+         if ( ace_yy_init )
+                 {
+@@ -774,71 +790,71 @@
  case 2:
  ACE_YY_RULE_SETUP
  { return token (ACE_DYNAMIC); }
--	ACE_YY_BREAK
-+	//      ACE_YY_BREAK
+-        ACE_YY_BREAK
++        //ACE_YY_BREAK
  case 3:
  ACE_YY_RULE_SETUP
  { return token (ACE_STATIC); }
--	ACE_YY_BREAK
-+	//      ACE_YY_BREAK
+-        ACE_YY_BREAK
++        //ACE_YY_BREAK
  case 4:
  ACE_YY_RULE_SETUP
  { return token (ACE_SUSPEND); }
--	ACE_YY_BREAK
-+	//      ACE_YY_BREAK
+-        ACE_YY_BREAK
++        //ACE_YY_BREAK
  case 5:
  ACE_YY_RULE_SETUP
  { return token (ACE_RESUME); }
--	ACE_YY_BREAK
-+	//      ACE_YY_BREAK
+-        ACE_YY_BREAK
++        //ACE_YY_BREAK
  case 6:
  ACE_YY_RULE_SETUP
  { return token (ACE_REMOVE); }
--	ACE_YY_BREAK
-+	//      ACE_YY_BREAK
+-        ACE_YY_BREAK
++        //ACE_YY_BREAK
  case 7:
  ACE_YY_RULE_SETUP
  { return token (ACE_USTREAM); }
--	ACE_YY_BREAK
-+	//      ACE_YY_BREAK
+-        ACE_YY_BREAK
++        //ACE_YY_BREAK
  case 8:
  ACE_YY_RULE_SETUP
  { return token (ACE_MODULE_T); }
--	ACE_YY_BREAK
-+	//      ACE_YY_BREAK
+-        ACE_YY_BREAK
++        //ACE_YY_BREAK
  case 9:
  ACE_YY_RULE_SETUP
  { return token (ACE_SVC_OBJ_T); }
--	ACE_YY_BREAK
-+	//      ACE_YY_BREAK
+-        ACE_YY_BREAK
++        //ACE_YY_BREAK
  case 10:
  ACE_YY_RULE_SETUP
  { return token (ACE_STREAM_T); }
--	ACE_YY_BREAK
-+	//      ACE_YY_BREAK
+-        ACE_YY_BREAK
++        //ACE_YY_BREAK
  case 11:
  ACE_YY_RULE_SETUP
  { return token (ACE_ACTIVE); }
--	ACE_YY_BREAK
-+	//      ACE_YY_BREAK
+-        ACE_YY_BREAK
++        //ACE_YY_BREAK
  case 12:
  ACE_YY_RULE_SETUP
  { return token (ACE_INACTIVE); }
--	ACE_YY_BREAK
-+	//      ACE_YY_BREAK
+-        ACE_YY_BREAK
++        //ACE_YY_BREAK
  case 13:
  ACE_YY_RULE_SETUP
  { return token (':'); }
--	ACE_YY_BREAK
-+	//      ACE_YY_BREAK
+-        ACE_YY_BREAK
++        //ACE_YY_BREAK
  case 14:
  ACE_YY_RULE_SETUP
  { return token ('*'); }
--	ACE_YY_BREAK
-+	//      ACE_YY_BREAK
+-        ACE_YY_BREAK
++        //ACE_YY_BREAK
  case 15:
  ACE_YY_RULE_SETUP
  { return token ('('); }
--	ACE_YY_BREAK
-+	//      ACE_YY_BREAK
+-        ACE_YY_BREAK
++        //ACE_YY_BREAK
  case 16:
  ACE_YY_RULE_SETUP
  { return token (')'); }
--	ACE_YY_BREAK
-+	//      ACE_YY_BREAK
+-        ACE_YY_BREAK
++        //ACE_YY_BREAK
  case 17:
  ACE_YY_RULE_SETUP
  { return token ('{'); }
--	ACE_YY_BREAK
-+	//      ACE_YY_BREAK
+-        ACE_YY_BREAK
++        //ACE_YY_BREAK
  case 18:
  ACE_YY_RULE_SETUP
  { return token ('}'); }
--	ACE_YY_BREAK
-+	//      ACE_YY_BREAK
+-        ACE_YY_BREAK
++        //ACE_YY_BREAK
  case 19:
  ACE_YY_RULE_SETUP
  {
-@@ -863,21 +868,21 @@
- 			ace_yyleng -= 1;
+@@ -852,21 +868,21 @@
+                         ace_yyleng -= 1;
                          ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext + 1, ace_yyleng);
- 			return token (ACE_STRING); }
--	ACE_YY_BREAK
-+//	ACE_YY_BREAK
+                         return token (ACE_STRING); }
+-        ACE_YY_BREAK
++        //ACE_YY_BREAK
  case 20:
  ACE_YY_RULE_SETUP
  {
- 		        ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext, ace_yyleng);
- 			return token (ACE_IDENT);
- 		      }
--	ACE_YY_BREAK
-+//	ACE_YY_BREAK
+                         ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext, ace_yyleng);
+                         return token (ACE_IDENT);
+                       }
+-        ACE_YY_BREAK
++        //ACE_YY_BREAK
  case 21:
  ACE_YY_RULE_SETUP
  {
- 		        ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext, ace_yyleng);
- 			return token (ACE_PATHNAME);
- 		      }
--	ACE_YY_BREAK
-+//	ACE_YY_BREAK
+                         ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext, ace_yyleng);
+                         return token (ACE_PATHNAME);
+                       }
+-        ACE_YY_BREAK
++        //ACE_YY_BREAK
  case 22:
  ACE_YY_RULE_SETUP
  ; /* EMPTY */
-@@ -913,7 +918,7 @@
- 
- 	case ACE_YY_END_OF_BUFFER:
- 		{
--		/* Amount of text matched not including the EOB char. */
-+		/* Amount of text matched not including the EOB ACE_TCHAR. */
- 		int ace_yy_amount_of_matched_text = (int) (ace_yy_cp - ace_yytext_ptr) - 1;
- 
- 		/* Undo the effects of ACE_YY_DO_BEFORE_ACTION. */
-@@ -1035,7 +1040,7 @@
- 
- 	default:
- 		ACE_YY_FATAL_ERROR(
--			"fatal flex scanner internal error--no action found" );
-+			ACE_LIB_TEXT("fatal flex scanner internal error--no action found") );
- 	} /* end of action switch */
- 		} /* end of scanning one token */
- 	} /* end of ace_yylex */
-@@ -1051,14 +1056,14 @@
- 
- static int ace_yy_get_next_buffer()
- 	{
--	register char *dest = ace_yy_current_buffer->ace_yy_ch_buf;
--	register char *source = ace_yytext_ptr;
-+	register ACE_TCHAR *dest = ace_yy_current_buffer->ace_yy_ch_buf;
-+	register ACE_TCHAR *source = ace_yytext_ptr;
- 	register int number_to_move, i;
- 	int ret_val;
- 
- 	if ( ace_yy_c_buf_p > &ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars + 1] )
- 		ACE_YY_FATAL_ERROR(
--		"fatal flex scanner internal error--end of buffer missed" );
-+		ACE_LIB_TEXT("fatal flex scanner internal error--end of buffer missed") );
- 
- 	if ( ace_yy_current_buffer->ace_yy_fill_buffer == 0 )
- 		{ /* Don't try to fill the buffer, so this is an EOF. */
-@@ -1101,8 +1106,8 @@
- 		while ( num_to_read <= 0 )
- 			{ /* Not enough room in the buffer - grow it. */
- #ifdef ACE_YY_USES_REJECT
--			ACE_YY_FATAL_ERROR(
--"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-+                          ACE_YY_FATAL_ERROR(ACE_LIB_TEXT(
-+"input buffer overflow, can't enlarge buffer because scanner uses REJECT") );
- #else
- 
- 			/* just a shorter name for the current buffer */
-@@ -1120,18 +1125,18 @@
- 				else
- 					b->ace_yy_buf_size *= 2;
- 
--				b->ace_yy_ch_buf = (char *)
-+				b->ace_yy_ch_buf = (ACE_TCHAR *)
- 					/* Include room in for 2 EOB chars. */
- 					ace_yy_flex_realloc( (void *) b->ace_yy_ch_buf,
--							 b->ace_yy_buf_size + 2 );
-+                                                      (b->ace_yy_buf_size + 2)*sizeof(ACE_TCHAR));
- 				}
- 			else
- 				/* Can't grow it, we don't own it. */
- 				b->ace_yy_ch_buf = 0;
- 
- 			if ( ! b->ace_yy_ch_buf )
--				ACE_YY_FATAL_ERROR(
--				"fatal error - scanner input buffer overflow" );
-+                          ACE_YY_FATAL_ERROR(ACE_LIB_TEXT(
-+				"fatal error - scanner input buffer overflow") );
- 
- 			ace_yy_c_buf_p = &b->ace_yy_ch_buf[ace_yy_c_buf_p_offset];
- 
-@@ -1140,8 +1145,8 @@
- #endif
- 			}
- 
--		if ( num_to_read > ACE_YY_READ_BUF_SIZE )
--			num_to_read = ACE_YY_READ_BUF_SIZE;
-+		if ( num_to_read * sizeof (ACE_TCHAR) > ACE_YY_READ_BUF_SIZE )
-+			num_to_read = ACE_YY_READ_BUF_SIZE/sizeof (ACE_TCHAR);
- 
- 		/* Read in more data. */
- 		ACE_YY_INPUT( (&ace_yy_current_buffer->ace_yy_ch_buf[number_to_move]),
-@@ -1179,12 +1184,12 @@
- 	}
- 
- 
--/* ace_yy_get_previous_state - get the state just before the EOB char was reached */
-+/* ace_yy_get_previous_state - get the state just before the EOB ACE_TCHAR was reached */
- 
- static ace_yy_state_type ace_yy_get_previous_state()
- 	{
- 	register ace_yy_state_type ace_yy_current_state;
--	register char *ace_yy_cp;
-+	register ACE_TCHAR *ace_yy_cp;
- 
- 	ace_yy_current_state = ace_yy_start;
- 	ace_yy_current_state += ACE_YY_AT_BOL();
-@@ -1224,7 +1229,7 @@
- #endif
- 	{
- 	register int ace_yy_is_jam;
--	register char *ace_yy_cp = ace_yy_c_buf_p;
-+	register ACE_TCHAR *ace_yy_cp = ace_yy_c_buf_p;
- 
- 	register ACE_YY_CHAR ace_yy_c = 1;
- 	if ( ace_yy_accept[ace_yy_current_state] )
-@@ -1247,14 +1252,14 @@
- 
- #ifndef ACE_YY_NO_UNPUT
- #ifdef ACE_YY_USE_PROTOS
--static void ace_yyunput( int c, register char *ace_yy_bp )
-+static void ace_yyunput( int c, register ACE_TCHAR *ace_yy_bp )
- #else
- static void ace_yyunput( c, ace_yy_bp )
- int c;
--register char *ace_yy_bp;
-+register ACE_TCHAR *ace_yy_bp;
- #endif
- 	{
--	register char *ace_yy_cp = ace_yy_c_buf_p;
-+	register ACE_TCHAR *ace_yy_cp = ace_yy_c_buf_p;
- 
- 	/* undo effects of setting up ace_yytext */
- 	*ace_yy_cp = ace_yy_hold_char;
-@@ -1263,9 +1268,9 @@
- 		{ /* need to shift things up to make room */
- 		/* +2 for EOB chars. */
- 		register int number_to_move = ace_yy_n_chars + 2;
--		register char *dest = &ace_yy_current_buffer->ace_yy_ch_buf[
-+		register ACE_TCHAR *dest = &ace_yy_current_buffer->ace_yy_ch_buf[
- 					ace_yy_current_buffer->ace_yy_buf_size + 2];
--		register char *source =
-+		register ACE_TCHAR *source =
- 				&ace_yy_current_buffer->ace_yy_ch_buf[number_to_move];
- 
- 		while ( source > ace_yy_current_buffer->ace_yy_ch_buf )
-@@ -1277,10 +1282,10 @@
- 			ace_yy_n_chars = ace_yy_current_buffer->ace_yy_buf_size;
- 
- 		if ( ace_yy_cp < ace_yy_current_buffer->ace_yy_ch_buf + 2 )
--			ACE_YY_FATAL_ERROR( "flex scanner push-back overflow" );
-+			ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "flex scanner push-back overflow") );
- 		}
- 
--	*--ace_yy_cp = (char) c;
-+	*--ace_yy_cp = (ACE_TCHAR) c;
- 
- 
- 	ace_yytext_ptr = ace_yy_bp;
-@@ -1434,16 +1439,16 @@
- 
- 	b = (ACE_YY_BUFFER_STATE) ace_yy_flex_alloc( sizeof( struct ace_yy_buffer_state ) );
- 	if ( ! b )
--		ACE_YY_FATAL_ERROR( "out of dynamic memory in ace_yy_create_buffer()" );
-+		ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "out of dynamic memory in ace_yy_create_buffer()") );
- 
- 	b->ace_yy_buf_size = size;
- 
- 	/* ace_yy_ch_buf has to be 2 characters longer than the size given because
- 	 * we need to put in 2 end-of-buffer characters.
- 	 */
--	b->ace_yy_ch_buf = (char *) ace_yy_flex_alloc( b->ace_yy_buf_size + 2 );
-+	b->ace_yy_ch_buf = (ACE_TCHAR *) ace_yy_flex_alloc( (b->ace_yy_buf_size + 2 ) * sizeof (ACE_TCHAR));
- 	if ( ! b->ace_yy_ch_buf )
--		ACE_YY_FATAL_ERROR( "out of dynamic memory in ace_yy_create_buffer()" );
-+		ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "out of dynamic memory in ace_yy_create_buffer()") );
- 
- 	b->ace_yy_is_our_buffer = 1;
- 
-@@ -1472,15 +1477,16 @@
- 	ace_yy_flex_free( (void *) b );
- 	}
- 
--
--#ifndef _WIN32
--#include /**/ "ace/OS.h"
--#else
- #ifndef ACE_YY_ALWAYS_INTERACTIVE
- #ifndef ACE_YY_NEVER_INTERACTIVE
- extern int nop_isatty ACE_YY_PROTO(( int ));
- #endif
- #endif
-+
-+#ifndef ACE_YY_ALWAYS_INTERACTIVE
-+#ifndef ACE_YY_NEVER_INTERACTIVE
-+extern int nop_isatty ACE_YY_PROTO(( int ));
-+#endif
- #endif
- 
- #ifdef ACE_YY_USE_PROTOS
-@@ -1542,10 +1548,10 @@
- 
- #ifndef ACE_YY_NO_SCAN_BUFFER
- #ifdef ACE_YY_USE_PROTOS
--ACE_YY_BUFFER_STATE ace_yy_scan_buffer( char *base, ace_yy_size_t size )
-+ACE_YY_BUFFER_STATE ace_yy_scan_buffer( ACE_TCHAR *base, ace_yy_size_t size )
- #else
- ACE_YY_BUFFER_STATE ace_yy_scan_buffer( base, size )
--char *base;
-+ACE_TCHAR *base;
- ace_yy_size_t size;
- #endif
- 	{
-@@ -1559,7 +1565,7 @@
- 
- 	b = (ACE_YY_BUFFER_STATE) ace_yy_flex_alloc( sizeof( struct ace_yy_buffer_state ) );
- 	if ( ! b )
--		ACE_YY_FATAL_ERROR( "out of dynamic memory in ace_yy_scan_buffer()" );
-+		ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "out of dynamic memory in ace_yy_scan_buffer()" ));
- 
- 	b->ace_yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
- 	b->ace_yy_buf_pos = b->ace_yy_ch_buf = base;
-@@ -1580,10 +1586,10 @@
- 
- #ifndef ACE_YY_NO_SCAN_STRING
- #ifdef ACE_YY_USE_PROTOS
--ACE_YY_BUFFER_STATE ace_yy_scan_string( ace_yyconst char *ace_yy_str )
-+ACE_YY_BUFFER_STATE ace_yy_scan_string( ace_yyconst ACE_TCHAR *ace_yy_str )
- #else
- ACE_YY_BUFFER_STATE ace_yy_scan_string( ace_yy_str )
--ace_yyconst char *ace_yy_str;
-+ace_yyconst ACE_TCHAR *ace_yy_str;
- #endif
- 	{
- 	int len;
-@@ -1597,23 +1603,23 @@
- 
- #ifndef ACE_YY_NO_SCAN_BYTES
- #ifdef ACE_YY_USE_PROTOS
--ACE_YY_BUFFER_STATE ace_yy_scan_bytes( ace_yyconst char *bytes, int len )
-+ACE_YY_BUFFER_STATE ace_yy_scan_bytes( ace_yyconst ACE_TCHAR *bytes, int len )
- #else
- ACE_YY_BUFFER_STATE ace_yy_scan_bytes( bytes, len )
--ace_yyconst char *bytes;
-+ace_yyconst ACE_TCHAR *bytes;
- int len;
- #endif
- 	{
- 	ACE_YY_BUFFER_STATE b;
--	char *buf;
-+	ACE_TCHAR *buf;
- 	ace_yy_size_t n;
- 	int i;
- 
- 	/* Get memory for full buffer, including space for trailing EOB's. */
- 	n = len + 2;
--	buf = (char *) ace_yy_flex_alloc( n );
-+	buf = (ACE_TCHAR *) ace_yy_flex_alloc( n * sizeof (ACE_TCHAR));
- 	if ( ! buf )
--		ACE_YY_FATAL_ERROR( "out of dynamic memory in ace_yy_scan_bytes()" );
-+		ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "out of dynamic memory in ace_yy_scan_bytes()" ));
- 
- 	for ( i = 0; i < len; ++i )
- 		buf[i] = bytes[i];
-@@ -1622,7 +1628,7 @@
- 
- 	b = ace_yy_scan_buffer( buf, n );
- 	if ( ! b )
--		ACE_YY_FATAL_ERROR( "bad buffer in ace_yy_scan_bytes()" );
-+		ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "bad buffer in ace_yy_scan_bytes()") );
- 
- 	/* It's okay to grow etc. this buffer, and we should throw it
- 	 * away when we're done.
-@@ -1657,8 +1663,8 @@
- 					(void *) ace_yy_start_stack, new_size );
- 
- 		if ( ! ace_yy_start_stack )
--			ACE_YY_FATAL_ERROR(
--			"out of memory expanding start-condition stack" );
-+                  ACE_YY_FATAL_ERROR(ACE_LIB_TEXT(
-+			"out of memory expanding start-condition stack" ));
- 		}
- 
- 	ace_yy_start_stack[ace_yy_start_stack_ptr++] = ACE_YY_START;
-@@ -1672,7 +1678,7 @@
- static void ace_yy_pop_state()
- 	{
- 	if ( --ace_yy_start_stack_ptr < 0 )
--		ACE_YY_FATAL_ERROR( "start-condition stack underflow" );
-+		ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "start-condition stack underflow" ));
- 
- 	BEGIN(ace_yy_start_stack[ace_yy_start_stack_ptr]);
- 	}
-@@ -1691,13 +1697,13 @@
- #endif
- 
- #ifdef ACE_YY_USE_PROTOS
--static void ace_yy_fatal_error( ace_yyconst char msg[] )
-+static void ace_yy_fatal_error( ace_yyconst ACE_TCHAR msg[] )
- #else
- static void ace_yy_fatal_error( msg )
--char msg[];
-+ACE_TCHAR msg[];
- #endif
- 	{
--	(void) fprintf( stderr, "%s\n", msg );
-+	(void) ACE_OS::fprintf( stderr, ACE_LIB_TEXT("%s\n"), msg );
- 	exit( ACE_YY_EXIT_FAILURE );
- 	}
- 
-@@ -1723,11 +1729,11 @@
- 
- #ifndef ace_yytext_ptr
- #ifdef ACE_YY_USE_PROTOS
--static void ace_yy_flex_strncpy( char *s1, ace_yyconst char *s2, int n )
-+static void ace_yy_flex_strncpy( ACE_TCHAR *s1, ace_yyconst ACE_TCHAR *s2, int n )
- #else
- static void ace_yy_flex_strncpy( s1, s2, n )
--char *s1;
--ace_yyconst char *s2;
-+ACE_TCHAR *s1;
-+ace_yyconst ACE_TCHAR *s2;
- int n;
- #endif
- 	{
-@@ -1739,10 +1745,10 @@
- 
- #ifdef ACE_YY_NEED_STRLEN
- #ifdef ACE_YY_USE_PROTOS
--static int ace_yy_flex_strlen( ace_yyconst char *s )
-+static int ace_yy_flex_strlen( ace_yyconst ACE_TCHAR *s )
- #else
- static int ace_yy_flex_strlen( s )
--ace_yyconst char *s;
-+ace_yyconst ACE_TCHAR *s;
- #endif
- 	{
- 	register int n;
-@@ -1850,3 +1856,5 @@
- 
-   ace_yy_switch_to_buffer (buffer);
- }
-+
-+#endif /* ACE_USES_CLASSIC_SVC_CONF = 1 */
diff --git a/etc/Svc_Conf_y.cpp.diff b/etc/Svc_Conf_y.cpp.diff
deleted file mode 100644
index 0a4c63e0023..00000000000
--- a/etc/Svc_Conf_y.cpp.diff
+++ /dev/null
@@ -1,337 +0,0 @@
---- Svc_Conf_y.cpp.old	2002-07-30 08:29:40.000000000 -0700
-+++ Svc_Conf_y.cpp	2002-07-30 08:31:11.000000000 -0700
-@@ -60,7 +60,7 @@
- #define ACE_YYTRANSLATE(x) ((unsigned)(x) <= 270 ? ace_yytranslate[x] : 43)
- 
- /* ACE_YYTRANSLATE[ACE_YYLEX] -- Bison token number corresponding to ACE_YYLEX. */
--static const char ace_yytranslate[] =
-+static const ACE_TCHAR ace_yytranslate[] =
- {
-        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-@@ -135,16 +135,52 @@
- #if (ACE_YYDEBUG) || defined ACE_YYERROR_VERBOSE
- 
- /* ACE_YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
--static const char *const ace_yytname[] =
-+static const ACE_TCHAR *const ace_yytname[] =
- {
--  "$", "error", "$undefined.", "ACE_DYNAMIC", "ACE_STATIC", "ACE_SUSPEND", 
--  "ACE_RESUME", "ACE_REMOVE", "ACE_USTREAM", "ACE_MODULE_T", 
--  "ACE_STREAM_T", "ACE_SVC_OBJ_T", "ACE_ACTIVE", "ACE_INACTIVE", 
--  "ACE_PATHNAME", "ACE_IDENT", "ACE_STRING", "'{'", "'}'", "':'", "'('", 
--  "')'", "'*'", "svc_config_entries", "svc_config_entry", "dynamic", 
--  "static", "suspend", "resume", "remove", "stream", "@1", "stream_ops", 
--  "stream_modules", "@2", "module_list", "module", "svc_location", 
--  "status", "svc_initializer", "type", "parameters_opt", "pathname", 0
-+  ACE_LIB_TEXT ("$"),
-+  ACE_LIB_TEXT ("error"),
-+  ACE_LIB_TEXT ("$undefined."),
-+  ACE_LIB_TEXT ("ACE_DYNAMIC"),
-+  ACE_LIB_TEXT ("ACE_STATIC"),
-+  ACE_LIB_TEXT ("ACE_SUSPEND"),
-+  ACE_LIB_TEXT ("ACE_RESUME"),
-+  ACE_LIB_TEXT ("ACE_REMOVE"),
-+  ACE_LIB_TEXT ("ACE_USTREAM"),
-+  ACE_LIB_TEXT ("ACE_MODULE_T",) 
-+  ACE_LIB_TEXT ("ACE_STREAM_T"),
-+  ACE_LIB_TEXT ("ACE_SVC_OBJ_T"),
-+  ACE_LIB_TEXT ("ACE_ACTIVE"),
-+  ACE_LIB_TEXT ("ACE_INACTIVE",) 
-+  ACE_LIB_TEXT ("ACE_PATHNAME"),
-+  ACE_LIB_TEXT ("ACE_IDENT"),
-+  ACE_LIB_TEXT ("ACE_STRING"),
-+  ACE_LIB_TEXT ("'{'"),
-+  ACE_LIB_TEXT ("'}'"),
-+  ACE_LIB_TEXT ("':'"),
-+  ACE_LIB_TEXT ("'('"),
-+  ACE_LIB_TEXT ("')'"),
-+  ACE_LIB_TEXT ("'*'"),
-+  ACE_LIB_TEXT ("svc_config_entries"),
-+  ACE_LIB_TEXT ("svc_config_entry"),
-+  ACE_LIB_TEXT ("dynamic",) 
-+  ACE_LIB_TEXT ("static"),
-+  ACE_LIB_TEXT ("suspend"),
-+  ACE_LIB_TEXT ("resume"),
-+  ACE_LIB_TEXT ("remove"),
-+  ACE_LIB_TEXT ("stream"),
-+  ACE_LIB_TEXT ("@1"),
-+  ACE_LIB_TEXT ("stream_ops",) 
-+  ACE_LIB_TEXT ("stream_modules"),
-+  ACE_LIB_TEXT ("@2"),
-+  ACE_LIB_TEXT ("module_list"),
-+  ACE_LIB_TEXT ("module"),
-+  ACE_LIB_TEXT ("svc_location",) 
-+  ACE_LIB_TEXT ("status"),
-+  ACE_LIB_TEXT ("svc_initializer"),
-+  ACE_LIB_TEXT ("type"),
-+  ACE_LIB_TEXT ("parameters_opt"),
-+  ACE_LIB_TEXT ("pathname"),
-+  0
- };
- #endif
- 
-@@ -409,7 +445,7 @@
-     }								\
-   else								\
-     { 								\
--      ace_yyerror ("syntax error: cannot back up");			\
-+      ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, ACE_LIB_TEXT ("syntax error: cannot back up"));			\
-       ACE_YYERROR;							\
-     }								\
- while (0)
-@@ -502,13 +538,13 @@
- /* Return the length of ACE_YYSTR.  */
- static ACE_YYSIZE_T
- #   if defined (__STDC__) || defined (__cplusplus)
--ace_yystrlen (const char *ace_yystr)
-+ace_yystrlen (const ACE_TCHAR *ace_yystr)
- #   else
- ace_yystrlen (ace_yystr)
--     const char *ace_yystr;
-+     const ACE_TCHAR *ace_yystr;
- #   endif
- {
--  register const char *ace_yys = ace_yystr;
-+  register const ACE_TCHAR *ace_yys = ace_yystr;
- 
-   while (*ace_yys++ != '\0')
-     continue;
-@@ -526,15 +562,15 @@
-    ACE_YYDEST.  */
- static char *
- #   if defined (__STDC__) || defined (__cplusplus)
--ace_yystpcpy (char *ace_yydest, const char *ace_yysrc)
-+ace_yystpcpy (ACE_TCHAR *ace_yydest, const ACE_TCHAR *ace_yysrc)
- #   else
- ace_yystpcpy (ace_yydest, ace_yysrc)
--     char *ace_yydest;
--     const char *ace_yysrc;
-+     ACE_TCHAR *ace_yydest;
-+     const ACE_TCHAR *ace_yysrc;
- #   endif
- {
--  register char *ace_yyd = ace_yydest;
--  register const char *ace_yys = ace_yysrc;
-+  register ACE_TCHAR *ace_yyd = ace_yydest;
-+  register const ACE_TCHAR *ace_yys = ace_yysrc;
- 
-   while ((*ace_yyd++ = *ace_yys++) != '\0')
-     continue;
-@@ -668,7 +704,7 @@
-      rule. */
-   int ace_yylen;
- 
--  ACE_YYDPRINTF ((stderr, "Starting parse\n"));
-+  ACE_YYDPRINTF ((stderr, ACE_LIB_TEXT ("Starting parse\n")));
- 
-   ace_yystate = 0;
-   ace_yyerrstatus = 0;
-@@ -718,14 +754,14 @@
- 	ACE_YYLTYPE *ace_yyls1 = ace_yyls;
- 	/* This used to be a conditional around just the two extra args,
- 	   but that might be undefined if ace_yyoverflow is a macro.  */
--	ace_yyoverflow ("parser stack overflow",
-+	ace_yyoverflow (ACE_LIB_TEXT ("parser stack overflow"),
- 		    &ace_yyss1, ace_yysize * sizeof (*ace_yyssp),
- 		    &ace_yyvs1, ace_yysize * sizeof (*ace_yyvsp),
- 		    &ace_yyls1, ace_yysize * sizeof (*ace_yylsp),
- 		    &ace_yystacksize);
- 	ace_yyls = ace_yyls1;
- # else
--	ace_yyoverflow ("parser stack overflow",
-+	ace_yyoverflow (ACE_LIB_TEXT ("parser stack overflow"),
- 		    &ace_yyss1, ace_yysize * sizeof (*ace_yyssp),
- 		    &ace_yyvs1, ace_yysize * sizeof (*ace_yyvsp),
- 		    &ace_yystacksize);
-@@ -768,14 +804,14 @@
-       ace_yylsp = ace_yyls + ace_yysize - 1;
- #endif
- 
--      ACE_YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-+      ACE_YYDPRINTF ((stderr, ACE_LIB_TEXT ("Stack size increased to %lu\n"),
- 		  (unsigned long int) ace_yystacksize));
- 
-       if (ace_yyssp >= ace_yyss + ace_yystacksize - 1)
- 	ACE_YYABORT;
-     }
- 
--  ACE_YYDPRINTF ((stderr, "Entering state %d\n", ace_yystate));
-+  ACE_YYDPRINTF ((stderr, ACE_LIB_TEXT ("Entering state %d\n"), ace_yystate));
- 
-   goto ace_yybackup;
- 
-@@ -802,7 +838,7 @@
- 
-   if (ace_yychar == ACE_YYEMPTY)
-     {
--      ACE_YYDPRINTF ((stderr, "Reading a token: "));
-+      ACE_YYDPRINTF ((stderr, ACE_LIB_TEXT ("Reading a token: ")));
-       ace_yychar = ACE_YYLEX;
-     }
- 
-@@ -813,7 +849,7 @@
-       ace_yychar1 = 0;
-       ace_yychar = ACE_YYEOF;		/* Don't call ACE_YYLEX any more */
- 
--      ACE_YYDPRINTF ((stderr, "Now at end of input.\n"));
-+      ACE_YYDPRINTF ((stderr, ACE_LIB_TEXT ("Now at end of input.\n")));
-     }
-   else
-     {
-@@ -824,14 +860,14 @@
- 	which are defined only if `ACE_YYDEBUG' is set.  */
-       if (ace_yydebug)
- 	{
--	  ACE_YYFPRINTF (stderr, "Next token is %d (%s",
-+	  ACE_YYFPRINTF (stderr, ACE_LIB_TEXT ("Next token is %d (%s"),
- 		     ace_yychar, ace_yytname[ace_yychar1]);
- 	  /* Give the individual parser a way to print the precise
- 	     meaning of a token, for further debugging info.  */
- # ifdef ACE_YYPRINT
- 	  ACE_YYPRINT (stderr, ace_yychar, ace_yylval);
- # endif
--	  ACE_YYFPRINTF (stderr, ")\n");
-+	  ACE_YYFPRINTF (stderr, ACE_LIB_TEXT (")\n"));
- 	}
- #endif
-     }
-@@ -863,7 +899,7 @@
-     ACE_YYACCEPT;
- 
-   /* Shift the lookahead token.  */
--  ACE_YYDPRINTF ((stderr, "Shifting token %d (%s), ",
-+  ACE_YYDPRINTF ((stderr, ACE_LIB_TEXT ("Shifting token %d (%s), "),
- 	      ace_yychar, ace_yytname[ace_yychar1]));
- 
-   /* Discard the token being shifted unless it is eof.  */
-@@ -925,13 +961,13 @@
-     {
-       int ace_yyi;
- 
--      ACE_YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
-+      ACE_YYFPRINTF (stderr, ACE_LIB_TEXT ("Reducing via rule %d (line %d), "),
- 		 ace_yyn, ace_yyrline[ace_yyn]);
- 
-       /* Print the symbols being reduced, and their result.  */
-       for (ace_yyi = ace_yyprhs[ace_yyn]; ace_yyrhs[ace_yyi] > 0; ace_yyi++)
--	ACE_YYFPRINTF (stderr, "%s ", ace_yytname[ace_yyrhs[ace_yyi]]);
--      ACE_YYFPRINTF (stderr, " -> %s\n", ace_yytname[ace_yyr1[ace_yyn]]);
-+	ACE_YYFPRINTF (stderr, ACE_LIB_TEXT ("%s "), ace_yytname[ace_yyrhs[ace_yyi]]);
-+      ACE_YYFPRINTF (stderr, ACE_LIB_TEXT (" -> %s\n"), ace_yytname[ace_yyr1[ace_yyn]]);
-     }
- #endif
- 
-@@ -1205,10 +1241,10 @@
-   if (ace_yydebug)
-     {
-       short *ace_yyssp1 = ace_yyss - 1;
--      ACE_YYFPRINTF (stderr, "state stack now");
-+      ACE_YYFPRINTF (stderr, ACE_LIB_TEXT ("state stack now"));
-       while (ace_yyssp1 != ace_yyssp)
--	ACE_YYFPRINTF (stderr, " %d", *++ace_yyssp1);
--      ACE_YYFPRINTF (stderr, "\n");
-+	ACE_YYFPRINTF (stderr, ACE_LIB_TEXT (" %d"), *++ace_yyssp1);
-+      ACE_YYFPRINTF (stderr, ACE_LIB_TEXT ("\n"));
-     }
- #endif
- 
-@@ -1247,47 +1283,47 @@
-       if (ace_yyn > ACE_YYFLAG && ace_yyn < ACE_YYLAST)
- 	{
- 	  ACE_YYSIZE_T ace_yysize = 0;
--	  char *ace_yymsg;
-+	  ACE_TCHAR *ace_yymsg;
- 	  int ace_yyx, ace_yycount;
- 
- 	  ace_yycount = 0;
- 	  /* Start ACE_YYX at -ACE_YYN if negative to avoid negative indexes in
- 	     ACE_YYCHECK.  */
- 	  for (ace_yyx = ace_yyn < 0 ? -ace_yyn : 0;
--	       ace_yyx < (int) (sizeof (ace_yytname) / sizeof (char *)); ace_yyx++)
-+	       ace_yyx < (int) (sizeof (ace_yytname) / sizeof (ACE_TCHAR *)); ace_yyx++)
- 	    if (ace_yycheck[ace_yyx + ace_yyn] == ace_yyx)
- 	      ace_yysize += ace_yystrlen (ace_yytname[ace_yyx]) + 15, ace_yycount++;
--	  ace_yysize += ace_yystrlen ("parse error, unexpected ") + 1;
-+	  ace_yysize += ace_yystrlen (ACE_LIB_TEXT ("parse error, unexpected ")) + 1;
- 	  ace_yysize += ace_yystrlen (ace_yytname[ACE_YYTRANSLATE (ace_yychar)]);
--	  ace_yymsg = (char *) ACE_YYSTACK_ALLOC (ace_yysize);
-+	  ace_yymsg = (ACE_TCHAR *) ACE_YYSTACK_ALLOC (ace_yysize);
- 	  if (ace_yymsg != 0)
- 	    {
--	      char *ace_yyp = ace_yystpcpy (ace_yymsg, "parse error, unexpected ");
-+	      ACE_TCHAR *ace_yyp = ace_yystpcpy (ace_yymsg, ACE_LIB_TEXT ("parse error, unexpected "));
- 	      ace_yyp = ace_yystpcpy (ace_yyp, ace_yytname[ACE_YYTRANSLATE (ace_yychar)]);
- 
- 	      if (ace_yycount < 5)
- 		{
- 		  ace_yycount = 0;
- 		  for (ace_yyx = ace_yyn < 0 ? -ace_yyn : 0;
--		       ace_yyx < (int) (sizeof (ace_yytname) / sizeof (char *));
-+		       ace_yyx < (int) (sizeof (ace_yytname) / sizeof (ACE_TCHAR *));
- 		       ace_yyx++)
- 		    if (ace_yycheck[ace_yyx + ace_yyn] == ace_yyx)
- 		      {
--			const char *ace_yyq = ! ace_yycount ? ", expecting " : " or ";
-+			const ACE_TCHAR *ace_yyq = ! ace_yycount ? ACE_LIB_TEXT (", expecting ") : ACE_LIB_TEXT (" or ");
- 			ace_yyp = ace_yystpcpy (ace_yyp, ace_yyq);
- 			ace_yyp = ace_yystpcpy (ace_yyp, ace_yytname[ace_yyx]);
- 			ace_yycount++;
- 		      }
- 		}
--	      ace_yyerror (ace_yymsg);
-+	      ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, ace_yymsg);
- 	      ACE_YYSTACK_FREE (ace_yymsg);
- 	    }
- 	  else
--	    ace_yyerror ("parse error; also virtual memory exhausted");
-+	    ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, ACE_LIB_TEXT ("parse error; also virtual memory exhausted"));
- 	}
-       else
- #endif /* defined (ACE_YYERROR_VERBOSE) */
--	ace_yyerror ("parse error");
-+	ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, ACE_LIB_TEXT ("parse error"));
-     }
-   goto ace_yyerrlab1;
- 
-@@ -1304,7 +1340,7 @@
-       /* return failure if at end of input */
-       if (ace_yychar == ACE_YYEOF)
- 	ACE_YYABORT;
--      ACE_YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
-+      ACE_YYDPRINTF ((stderr, ACE_LIB_TEXT ("Discarding token %d (%s).\n"),
- 		  ace_yychar, ace_yytname[ace_yychar1]));
-       ace_yychar = ACE_YYEMPTY;
-     }
-@@ -1350,10 +1386,10 @@
-   if (ace_yydebug)
-     {
-       short *ace_yyssp1 = ace_yyss - 1;
--      ACE_YYFPRINTF (stderr, "Error: state stack now");
-+      ACE_YYFPRINTF (stderr, ACE_LIB_TEXT ("Error: state stack now"));
-       while (ace_yyssp1 != ace_yyssp)
--	ACE_YYFPRINTF (stderr, " %d", *++ace_yyssp1);
--      ACE_YYFPRINTF (stderr, "\n");
-+	ACE_YYFPRINTF (stderr, ACE_LIB_TEXT (" %d"), *++ace_yyssp1);
-+      ACE_YYFPRINTF (stderr, ACE_LIB_TEXT ("\n"));
-     }
- #endif
- 
-@@ -1383,7 +1419,7 @@
-   if (ace_yyn == ACE_YYFINAL)
-     ACE_YYACCEPT;
- 
--  ACE_YYDPRINTF ((stderr, "Shifting error token, "));
-+  ACE_YYDPRINTF ((stderr, ACE_LIB_TEXT ("Shifting error token, ")));
- 
-   *++ace_yyvsp = ace_yylval;
- #if ACE_YYLSP_NEEDED
-@@ -1412,7 +1448,7 @@
- | ace_yyoverflowab -- parser overflow comes here.  |
- `---------------------------------------------*/
- ace_yyoverflowlab:
--  ace_yyerror ("parser stack overflow");
-+  ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, ACE_LIB_TEXT ("parser stack overflow"));
-   ace_yyresult = 2;
-   /* Fall through.  */
-