ChangeLogTag: Mon Nov 19 00:53:54 2001 Krishnakumar B <kitty@cs.wustl.edu>

9 files changed, 559 insertions, 123 deletions

diff --git a/ChangeLog b/ChangeLog
index 240e1c47034..45204891afc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,39 @@
+Mon Nov 19 00:53:54 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * ace/Svc_Conf_y.cpp:
+        * ace/Svc_Conf_l.cpp:
+        * ace/Svc_Conf_Tokens.h:
+
+          Fixed some bugs introduced by my previous checkin because of
+          patch confusion. Replaced all the standard C system calls with
+          ACE_OS calls. Made it more wchar friendly.
+
+        * ace/Makefile:
+
+          Removed the dependency on /pkg/gnu/bin/flex. It was broken. We
+          now use $(LEX) and $(YACC) defined in
+          $ACE_ROOT/include/makeinclude/wrapper_macros.GNU.
+
+        * include/makeinclude/wrapper_macros.GNU:
+
+          Changed the definition of YACC to bison (by default). If people
+          want to change this, it can be overridden by a variable in the
+          Makefile. But things are most likely to break if you use yacc.
+
+        * etc/Svc_Conf_l.cpp.diff:
+        * etc/Svc_Conf_y.cpp.diff:
+
+          Regenerated the diffs.
+
+          *Sigh* This patching business is ugly.
+
+
 Fri Nov 16 07:22:19 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* bin/make_release: Updated the script to copy the beta to a
 	  different location.  Have tested this by creating a dummy
 	  repository and a dummy export directory. Things worked
-	  fine. Hopefully the beta should go through without any hassle. 
+	  fine. Hopefully the beta should go through without any hassle.
 
 	  The script is tied to its usage on ace.cs. Needs to be
 	  changed. Will do that after this beta goes out. Having too many
@@ -13,7 +43,7 @@ Thu Nov 15 20:44:40 2001  Craig Rodrigues  <crodrigu@bbn.com>
 
 	* etc/Svc_Conf_l.cpp.diff: Updated.  Thanks to Kitty for reporting it.
 	* etc/Svc_Conf_y.cpp.diff: Added.  We need it for uses of ACE_LIB_TEXT.
-	* ace/Makefile: Added rule to apply patch to Svc_Conf_y.cpp. 
+	* ace/Makefile: Added rule to apply patch to Svc_Conf_y.cpp.
 
 Thu Nov 15 08:26:57 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 
@@ -43,7 +73,7 @@ Tue Nov 13 15:25:04 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
 Sun Nov 11 09:50:52 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 
-	* ace/Naming_Context.cpp (info): Added an ACE_UNUSED_ARG to 
+	* ace/Naming_Context.cpp (info): Added an ACE_UNUSED_ARG to
 	  silence warning about "length" parameter and changed buf from
  	  char to ACE_TCHAR.  Thanks to Johnny Willemsen for reporting
  	  this.
@@ -96,7 +126,7 @@ Tue Nov 13 15:04:15 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 Tue Nov 13 11:46:11 2001  Chris Cleeland  <cleeland_c@ociweb.com>
 
-	* tests/Collection_Test.cpp (iterate_const): Fixed ACE_DEBUG print 
+	* tests/Collection_Test.cpp (iterate_const): Fixed ACE_DEBUG print
 	  statements that were accessing the element of the unbounded set
  	  as an int rather than an UglyThing.  Thanks to Ossama for
  	  pointing this out.
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 240e1c47034..45204891afc 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,9 +1,39 @@
+Mon Nov 19 00:53:54 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * ace/Svc_Conf_y.cpp:
+        * ace/Svc_Conf_l.cpp:
+        * ace/Svc_Conf_Tokens.h:
+
+          Fixed some bugs introduced by my previous checkin because of
+          patch confusion. Replaced all the standard C system calls with
+          ACE_OS calls. Made it more wchar friendly.
+
+        * ace/Makefile:
+
+          Removed the dependency on /pkg/gnu/bin/flex. It was broken. We
+          now use $(LEX) and $(YACC) defined in
+          $ACE_ROOT/include/makeinclude/wrapper_macros.GNU.
+
+        * include/makeinclude/wrapper_macros.GNU:
+
+          Changed the definition of YACC to bison (by default). If people
+          want to change this, it can be overridden by a variable in the
+          Makefile. But things are most likely to break if you use yacc.
+
+        * etc/Svc_Conf_l.cpp.diff:
+        * etc/Svc_Conf_y.cpp.diff:
+
+          Regenerated the diffs.
+
+          *Sigh* This patching business is ugly.
+
+
 Fri Nov 16 07:22:19 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* bin/make_release: Updated the script to copy the beta to a
 	  different location.  Have tested this by creating a dummy
 	  repository and a dummy export directory. Things worked
-	  fine. Hopefully the beta should go through without any hassle. 
+	  fine. Hopefully the beta should go through without any hassle.
 
 	  The script is tied to its usage on ace.cs. Needs to be
 	  changed. Will do that after this beta goes out. Having too many
@@ -13,7 +43,7 @@ Thu Nov 15 20:44:40 2001  Craig Rodrigues  <crodrigu@bbn.com>
 
 	* etc/Svc_Conf_l.cpp.diff: Updated.  Thanks to Kitty for reporting it.
 	* etc/Svc_Conf_y.cpp.diff: Added.  We need it for uses of ACE_LIB_TEXT.
-	* ace/Makefile: Added rule to apply patch to Svc_Conf_y.cpp. 
+	* ace/Makefile: Added rule to apply patch to Svc_Conf_y.cpp.
 
 Thu Nov 15 08:26:57 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 
@@ -43,7 +73,7 @@ Tue Nov 13 15:25:04 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
 Sun Nov 11 09:50:52 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 
-	* ace/Naming_Context.cpp (info): Added an ACE_UNUSED_ARG to 
+	* ace/Naming_Context.cpp (info): Added an ACE_UNUSED_ARG to
 	  silence warning about "length" parameter and changed buf from
  	  char to ACE_TCHAR.  Thanks to Johnny Willemsen for reporting
  	  this.
@@ -96,7 +126,7 @@ Tue Nov 13 15:04:15 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 Tue Nov 13 11:46:11 2001  Chris Cleeland  <cleeland_c@ociweb.com>
 
-	* tests/Collection_Test.cpp (iterate_const): Fixed ACE_DEBUG print 
+	* tests/Collection_Test.cpp (iterate_const): Fixed ACE_DEBUG print
 	  statements that were accessing the element of the unbounded set
  	  as an int rather than an UglyThing.  Thanks to Ossama for
  	  pointing this out.
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 240e1c47034..45204891afc 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,9 +1,39 @@
+Mon Nov 19 00:53:54 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * ace/Svc_Conf_y.cpp:
+        * ace/Svc_Conf_l.cpp:
+        * ace/Svc_Conf_Tokens.h:
+
+          Fixed some bugs introduced by my previous checkin because of
+          patch confusion. Replaced all the standard C system calls with
+          ACE_OS calls. Made it more wchar friendly.
+
+        * ace/Makefile:
+
+          Removed the dependency on /pkg/gnu/bin/flex. It was broken. We
+          now use $(LEX) and $(YACC) defined in
+          $ACE_ROOT/include/makeinclude/wrapper_macros.GNU.
+
+        * include/makeinclude/wrapper_macros.GNU:
+
+          Changed the definition of YACC to bison (by default). If people
+          want to change this, it can be overridden by a variable in the
+          Makefile. But things are most likely to break if you use yacc.
+
+        * etc/Svc_Conf_l.cpp.diff:
+        * etc/Svc_Conf_y.cpp.diff:
+
+          Regenerated the diffs.
+
+          *Sigh* This patching business is ugly.
+
+
 Fri Nov 16 07:22:19 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* bin/make_release: Updated the script to copy the beta to a
 	  different location.  Have tested this by creating a dummy
 	  repository and a dummy export directory. Things worked
-	  fine. Hopefully the beta should go through without any hassle. 
+	  fine. Hopefully the beta should go through without any hassle.
 
 	  The script is tied to its usage on ace.cs. Needs to be
 	  changed. Will do that after this beta goes out. Having too many
@@ -13,7 +43,7 @@ Thu Nov 15 20:44:40 2001  Craig Rodrigues  <crodrigu@bbn.com>
 
 	* etc/Svc_Conf_l.cpp.diff: Updated.  Thanks to Kitty for reporting it.
 	* etc/Svc_Conf_y.cpp.diff: Added.  We need it for uses of ACE_LIB_TEXT.
-	* ace/Makefile: Added rule to apply patch to Svc_Conf_y.cpp. 
+	* ace/Makefile: Added rule to apply patch to Svc_Conf_y.cpp.
 
 Thu Nov 15 08:26:57 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 
@@ -43,7 +73,7 @@ Tue Nov 13 15:25:04 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
 Sun Nov 11 09:50:52 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 
-	* ace/Naming_Context.cpp (info): Added an ACE_UNUSED_ARG to 
+	* ace/Naming_Context.cpp (info): Added an ACE_UNUSED_ARG to
 	  silence warning about "length" parameter and changed buf from
  	  char to ACE_TCHAR.  Thanks to Johnny Willemsen for reporting
  	  this.
@@ -96,7 +126,7 @@ Tue Nov 13 15:04:15 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 Tue Nov 13 11:46:11 2001  Chris Cleeland  <cleeland_c@ociweb.com>
 
-	* tests/Collection_Test.cpp (iterate_const): Fixed ACE_DEBUG print 
+	* tests/Collection_Test.cpp (iterate_const): Fixed ACE_DEBUG print
 	  statements that were accessing the element of the unbounded set
  	  as an int rather than an UglyThing.  Thanks to Ossama for
  	  pointing this out.
diff --git a/ace/Makefile b/ace/Makefile
index fe845b1e039..b2b648316e3 100644
--- a/ace/Makefile
+++ b/ace/Makefile
@@ -530,43 +530,36 @@ all.nested: all.local
 	echo >> $@ "// EOF";
 
 Svc_Conf_y.cpp: Svc_Conf.y
-	if [ -f /pkg/gnu/bin/bison ]; then \
-          /pkg/gnu/bin/bison -l -d Svc_Conf.y; \
-          sed -e "s/char \*getenv/char *ace_foo/g" \
-              -e "s/= getenv/= ACE_OS::getenv/g" \
-              -e "s/yy/ace_yy/g" \
-              -e "s/->ace_yyerrno/->yyerrno/g" \
-              -e "s/YY/ACE_YY/g" \
-              -e "s/Svc_Conf\.tab\.c/Svc_Conf_y.cpp/g" < Svc_Conf.tab.c > /tmp/$@; \
-          cp /tmp/$@ $@; \
-          patch < ../etc/Svc_Conf_y.cpp.diff; \
-	  echo '// $$'\I\d'$$' > Svc_Conf_Tokens.h; \
-	  cat Svc_Conf.tab.h >> Svc_Conf_Tokens.h; \
-          $(RM) -f /tmp/$@ Svc_Conf.tab.c Svc_Conf.tab.h Svc_Conf_y.cpp.orig; \
-        else \
-          touch $@; \
-        fi
+	$(YACC) -l -d Svc_Conf.y; \
+	sed -e "s/char \*getenv/char *ace_foo/g" \
+	    -e "s/= getenv/= ACE_OS::getenv/g" \
+	    -e "s/fprintf/ACE_OS::fprintf/g" \
+            -e "s/yy/ace_yy/g" \
+            -e "s/->ace_yyerrno/->yyerrno/g" \
+	    -e "s/YY/ACE_YY/g" \
+            -e "s/Svc_Conf\.tab\.c/Svc_Conf_y.cpp/g" < Svc_Conf.tab.c > /tmp/$@; \
+	cp /tmp/$@ $@; \
+	patch < ../etc/Svc_Conf_y.cpp.diff; \
+	echo '// $$'\I\d'$$' > Svc_Conf_Tokens.h; \
+	cat Svc_Conf.tab.h >> Svc_Conf_Tokens.h; \
+	$(RM) -f /tmp/$@ Svc_Conf.tab.c Svc_Conf.tab.h Svc_Conf_y.cpp.orig;
 
 Svc_Conf_l.cpp: Svc_Conf.l
-	if [ -f /pkg/gnu/bin/flex ]; then \
-          /pkg/gnu/bin/flex -L -t -I Svc_Conf.l > $@; \
-          sed -e "s/unistd/stdio/g" \
-              -e "s/yy/ace_yy/g" \
-              -e "s/YY/ACE_YY/g" \
-              -e "s/free( ptr );/free( ACE_MALLOC_T (ptr) );/g" \
-              -e "s/exit( 1 );/ACE_OS::exit( 1 );/g" \
-              -e "s/isatty( fileno(file)/ACE_OS::isatty( fileno (file)/g" \
-              -e "s/int isatty/int nop_isatty/g" \
-              -e "s/realloc( ptr, size );/realloc( ACE_MALLOC_T (ptr), size );/g" \
-              -e "s@#include <stdio\.h>@#include \"ace/OS.h\"@" \
-              -e "s@#include <@#include /**/ <@" \
-              -e "s@ECHO@ACE_SVC_CONF_ECHO@" < $@ > /tmp/$@; \
-          cp /tmp/$@ $@; \
-          patch < ../etc/Svc_Conf_l.cpp.diff; \
-          $(RM) -f /tmp/$@ Svc_Conf_l.cpp.orig; \
-        else \
-          touch $@; \
-        fi
+	$(LEX) -L -t -I Svc_Conf.l > $@; \
+	sed -e "s/unistd/stdio/g" \
+	    -e "s/yy/ace_yy/g" \
+            -e "s/YY/ACE_YY/g" \
+            -e "s/free( ptr );/free( ACE_MALLOC_T (ptr) );/g" \
+            -e "s/exit( 1 );/ACE_OS::exit( 1 );/g" \
+            -e "s/isatty( fileno(file)/ACE_OS::isatty( fileno (file)/g" \
+            -e "s/int isatty/int nop_isatty/g" \
+            -e "s/realloc( ptr, size );/realloc( ACE_MALLOC_T (ptr), size );/g" \
+            -e "s@#include <stdio\.h>@#include \"ace/OS.h\"@" \
+            -e "s@#include <@#include /**/ <@" \
+            -e "s@ECHO@ACE_SVC_CONF_ECHO@" < $@ > /tmp/$@; \
+	cp /tmp/$@ $@; \
+	patch < ../etc/Svc_Conf_l.cpp.diff; \
+	$(RM) -f /tmp/$@ Svc_Conf_l.cpp.orig;
 
 # Some compilation for the QtReactor stuff. We need to run moc
 # ie. (Meta Object compiler) for our QtReactor.h. So, let's do it
diff --git a/ace/Svc_Conf_l.cpp b/ace/Svc_Conf_l.cpp
index c82bab96e51..be53770e146 100644
--- a/ace/Svc_Conf_l.cpp
+++ b/ace/Svc_Conf_l.cpp
@@ -1600,7 +1600,7 @@ int len;
 
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = len + 2;
-	buf = (ACE_TCHAR *) ace_yy_flex_alloc( n );
+	buf = (ACE_TCHAR *) ace_yy_flex_alloc( n * sizeof (ACE_TCHAR));
 	if ( ! buf )
 		ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "out of dynamic memory in ace_yy_scan_bytes()" ));
 
diff --git a/ace/Svc_Conf_y.cpp b/ace/Svc_Conf_y.cpp
index 820b5858271..5c76230b920 100644
--- a/ace/Svc_Conf_y.cpp
+++ b/ace/Svc_Conf_y.cpp
@@ -61,7 +61,7 @@ int ace_yyerrno = 0;
 
 #define ACE_YYTRANSLATE(x) ((unsigned)(x) <= 270 ? ace_yytranslate[x] : 43)
 
-static const char ace_yytranslate[] = {     0,
+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,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -130,13 +130,51 @@ static const short ace_yyrline[] = { 0,
 
 #if ACE_YYDEBUG != 0 || defined (ACE_YYERROR_VERBOSE)
 
-static const char * 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", NULL
+static const ACE_TCHAR * const ace_yytname[] = { 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"),
+                                                 NULL
 };
 #endif
 
@@ -317,7 +355,7 @@ do								\
       goto ace_yybackup;						\
     }								\
   else								\
-    { ace_yyerror ("syntax error: cannot back up"); ACE_YYERROR; }	\
+    { ace_yyerror (ACE_LIB_TEXT("syntax error: cannot back up")); ACE_YYERROR; }	\
 while (0)
 
 #define ACE_YYTERROR	1
@@ -396,12 +434,12 @@ int ace_yydebug;			/*  nonzero means print parse trace	*/
    in available built-in functions on various systems.  */
 static void
 __ace_yy_memcpy (to, from, count)
-     char *to;
-     char *from;
+     ACE_TCHAR *to;
+     ACE_TCHAR *from;
      unsigned int count;
 {
-  register char *f = from;
-  register char *t = to;
+  register ACE_TCHAR *f = from;
+  register ACE_TCHAR *t = to;
   register int i = count;
 
   while (i-- > 0)
@@ -413,10 +451,10 @@ __ace_yy_memcpy (to, from, count)
 /* This is the most reliable way to avoid incompatibilities
    in available built-in functions on various systems.  */
 static void
-__ace_yy_memcpy (char *to, char *from, unsigned int count)
+__ace_yy_memcpy (ACE_TCHAR *to, ACE_TCHAR *from, unsigned int count)
 {
-  register char *t = to;
-  register char *f = from;
+  register ACE_TCHAR *t = to;
+  register ACE_TCHAR *f = from;
   register int i = count;
 
   while (i-- > 0)
@@ -503,7 +541,7 @@ ace_yyparse(ACE_YYPARSE_PARAM_ARG)
 
 #if ACE_YYDEBUG != 0
   if (ace_yydebug)
-    fprintf(stderr, "Starting parse\n");
+    ACE_OS::fprintf(stderr, ACE_LIB_TEXT("Starting parse\n"));
 #endif
 
   ace_yystate = 0;
@@ -548,13 +586,13 @@ ace_yynewstate:
 #ifdef ACE_YYLSP_NEEDED
       /* 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, size * sizeof (*ace_yyssp),
 		 &ace_yyvs1, size * sizeof (*ace_yyvsp),
 		 &ace_yyls1, size * sizeof (*ace_yylsp),
 		 &ace_yystacksize);
 #else
-      ace_yyoverflow("parser stack overflow",
+      ace_yyoverflow(ACE_LIB_TEXT("parser stack overflow"),
 		 &ace_yyss1, size * sizeof (*ace_yyssp),
 		 &ace_yyvs1, size * sizeof (*ace_yyvsp),
 		 &ace_yystacksize);
@@ -586,14 +624,14 @@ ace_yynewstate:
       ace_yyfree_stacks = 1;
 #endif
       ace_yyss = (short *) ACE_YYSTACK_ALLOC (ace_yystacksize * sizeof (*ace_yyssp));
-      __ace_yy_memcpy ((char *)ace_yyss, (char *)ace_yyss1,
+      __ace_yy_memcpy ((ACE_TCHAR *)ace_yyss, (ACE_TCHAR *)ace_yyss1,
 		   size * (unsigned int) sizeof (*ace_yyssp));
       ace_yyvs = (ACE_YYSTYPE *) ACE_YYSTACK_ALLOC (ace_yystacksize * sizeof (*ace_yyvsp));
-      __ace_yy_memcpy ((char *)ace_yyvs, (char *)ace_yyvs1,
+      __ace_yy_memcpy ((ACE_TCHAR *)ace_yyvs, (ACE_TCHAR *)ace_yyvs1,
 		   size * (unsigned int) sizeof (*ace_yyvsp));
 #ifdef ACE_YYLSP_NEEDED
       ace_yyls = (ACE_YYLTYPE *) ACE_YYSTACK_ALLOC (ace_yystacksize * sizeof (*ace_yylsp));
-      __ace_yy_memcpy ((char *)ace_yyls, (char *)ace_yyls1,
+      __ace_yy_memcpy ((ACE_TCHAR *)ace_yyls, (ACE_TCHAR *)ace_yyls1,
 		   size * (unsigned int) sizeof (*ace_yylsp));
 #endif
 #endif /* no ace_yyoverflow */
@@ -606,7 +644,7 @@ ace_yynewstate:
 
 #if ACE_YYDEBUG != 0
       if (ace_yydebug)
-	fprintf(stderr, "Stack size increased to %d\n", ace_yystacksize);
+	ACE_OS::fprintf(stderr, ACE_LIB_TEXT("Stack size increased to %d\n"), ace_yystacksize);
 #endif
 
       if (ace_yyssp >= ace_yyss + ace_yystacksize - 1)
@@ -615,7 +653,7 @@ ace_yynewstate:
 
 #if ACE_YYDEBUG != 0
   if (ace_yydebug)
-    fprintf(stderr, "Entering state %d\n", ace_yystate);
+    ACE_OS::fprintf(stderr, ACE_LIB_TEXT("Entering state %d\n"), ace_yystate);
 #endif
 
   goto ace_yybackup;
@@ -640,7 +678,7 @@ ace_yynewstate:
     {
 #if ACE_YYDEBUG != 0
       if (ace_yydebug)
-	fprintf(stderr, "Reading a token: ");
+	ACE_OS::fprintf(stderr, ACE_LIB_TEXT("Reading a token: "));
 #endif
       ace_yychar = ACE_YYLEX;
     }
@@ -654,7 +692,7 @@ ace_yynewstate:
 
 #if ACE_YYDEBUG != 0
       if (ace_yydebug)
-	fprintf(stderr, "Now at end of input.\n");
+	ACE_OS::fprintf(stderr, ACE_LIB_TEXT("Now at end of input.\n"));
 #endif
     }
   else
@@ -664,13 +702,13 @@ ace_yynewstate:
 #if ACE_YYDEBUG != 0
       if (ace_yydebug)
 	{
-	  fprintf (stderr, "Next token is %d (%s", ace_yychar, ace_yytname[ace_yychar1]);
+	  ACE_OS::fprintf (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
-	  fprintf (stderr, ")\n");
+	  ACE_OS::fprintf (stderr, ACE_LIB_TEXT(")\n"));
 	}
 #endif
     }
@@ -705,7 +743,7 @@ ace_yynewstate:
 
 #if ACE_YYDEBUG != 0
   if (ace_yydebug)
-    fprintf(stderr, "Shifting token %d (%s), ", ace_yychar, ace_yytname[ace_yychar1]);
+    ACE_OS::fprintf(stderr, ACE_LIB_TEXT("Shifting token %d (%s), "), ace_yychar, ace_yytname[ace_yychar1]);
 #endif
 
   /* Discard the token being shifted unless it is eof.  */
@@ -741,13 +779,13 @@ ace_yyreduce:
     {
       int i;
 
-      fprintf (stderr, "Reducing via rule %d (line %d), ",
+      ACE_OS::fprintf (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 (i = ace_yyprhs[ace_yyn]; ace_yyrhs[i] > 0; i++)
-	fprintf (stderr, "%s ", ace_yytname[ace_yyrhs[i]]);
-      fprintf (stderr, " -> %s\n", ace_yytname[ace_yyr1[ace_yyn]]);
+	ACE_OS::fprintf (stderr, ACE_LIB_TEXT("%s "), ace_yytname[ace_yyrhs[i]]);
+      ACE_OS::fprintf (stderr, ACE_LIB_TEXT(" -> %s\n"), ace_yytname[ace_yyr1[ace_yyn]]);
     }
 #endif
 
@@ -1013,10 +1051,10 @@ case 41:
   if (ace_yydebug)
     {
       short *ssp1 = ace_yyss - 1;
-      fprintf (stderr, "state stack now");
+      ACE_OS::fprintf (stderr, ACE_LIB_TEXT("state stack now"));
       while (ssp1 != ace_yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
+	ACE_OS::fprintf (stderr, ACE_LIB_TEXT(" %d"), *++ssp1);
+      ACE_OS::fprintf (stderr, ACE_LIB_TEXT("\n"));
     }
 #endif
 
@@ -1067,35 +1105,35 @@ ace_yyerrlab:   /* here on detecting error */
       if (ace_yyn > ACE_YYFLAG && ace_yyn < ACE_YYLAST)
 	{
 	  int size = 0;
-	  char *msg;
+	  ACE_TCHAR *msg;
 	  int x, count;
 
 	  count = 0;
 	  /* Start X at -ace_yyn if nec to avoid negative indexes in ace_yycheck.  */
 	  for (x = (ace_yyn < 0 ? -ace_yyn : 0);
-	       x < (sizeof(ace_yytname) / sizeof(char *)); x++)
+	       x < (sizeof(ace_yytname) / sizeof(ACE_TCHAR *)); x++)
 	    if (ace_yycheck[x + ace_yyn] == x)
-	      size += strlen(ace_yytname[x]) + 15, count++;
-	  msg = (char *) malloc(size + 15);
+	      size += ACE_OS::strlen(ace_yytname[x]) + 15, count++;
+	  msg = new ACE_TCHAR[size + 15];
 	  if (msg != 0)
 	    {
-	      strcpy(msg, "parse error");
+	      ACE_OS::strcpy(msg, ACE_LIB_TEXT("parse error"));
 
 	      if (count < 5)
 		{
 		  count = 0;
 		  for (x = (ace_yyn < 0 ? -ace_yyn : 0);
-		       x < (sizeof(ace_yytname) / sizeof(char *)); x++)
+		       x < (sizeof(ace_yytname) / sizeof(ACE_TCHAR *)); x++)
 		    if (ace_yycheck[x + ace_yyn] == x)
 		      {
-			strcat(msg, count == 0 ? ", expecting `" : " or `");
-			strcat(msg, ace_yytname[x]);
-			strcat(msg, "'");
+			ACE_OS::strcat(msg, count == 0 ? ACE_LIB_TEXT(", expecting `") : ACE_LIB_TEXT(" or `"));
+			ACE_OS::strcat(msg, ACE_TEXT_CHAR_TO_TCHAR (ace_yytname[x]));
+			ACE_OS::strcat(msg, ACE_LIB_TEXT("'"));
 			count++;
 		      }
 		}
 	      ace_yyerror(msg);
-	      free(msg);
+	      delete [] msg;
 	    }
 	  else
 	    ace_yyerror (ACE_LIB_TEXT("parse error; also virtual memory exceeded"));
@@ -1118,7 +1156,7 @@ ace_yyerrlab1:   /* here on error raised explicitly by an action */
 
 #if ACE_YYDEBUG != 0
       if (ace_yydebug)
-	fprintf(stderr, "Discarding token %d (%s).\n", ace_yychar, ace_yytname[ace_yychar1]);
+	ACE_OS::fprintf(stderr, ACE_LIB_TEXT("Discarding token %d (%s).\n"), ace_yychar, ace_yytname[ace_yychar1]);
 #endif
 
       ace_yychar = ACE_YYEMPTY;
@@ -1153,10 +1191,10 @@ ace_yyerrpop:   /* pop the current state because it cannot handle the error toke
   if (ace_yydebug)
     {
       short *ssp1 = ace_yyss - 1;
-      fprintf (stderr, "Error: state stack now");
+      ACE_OS::fprintf (stderr, ACE_LIB_TEXT("Error: state stack now"));
       while (ssp1 != ace_yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
+	ACE_OS::fprintf (stderr, ACE_LIB_TEXT(" %d"), *++ssp1);
+      ACE_OS::fprintf (stderr, ACE_LIB_TEXT("\n"));
     }
 #endif
 
@@ -1186,7 +1224,7 @@ ace_yyerrhandle:
 
 #if ACE_YYDEBUG != 0
   if (ace_yydebug)
-    fprintf(stderr, "Shifting error token, ");
+    ACE_OS::fprintf(stderr, ACE_LIB_TEXT("Shifting error token, "));
 #endif
 
   *++ace_yyvsp = ace_yylval;
@@ -1355,13 +1393,13 @@ ACE_TCHAR *program_name;
 // Main driver program.
 
 int
-main (int argc, char *argv[])
+main (int argc, ACE_TCHAR *argv[])
 {
   ACE_Svc_Conf_Param param (stdin);
 
   // Try to reopen any filename argument to use ACE_YYIN.
-  if (argc > 1 && (ace_yyin = freopen (argv[1], "r", stdin)) == 0)
-    (void) ::fprintf (stderr, "usage: %s [file]\n", argv[0]), ACE_OS::exit (1);
+  if (argc > 1 && (ace_yyin = freopen (argv[1], ACE_LIB_TEXT("r"), stdin)) == 0)
+    ACE_OS::fprintf (stderr, ACE_LIB_TEXT("usage: %s [file]\n"), argv[0]), ACE_OS::exit (1);
 
   return ace_yyparse (&param);
 }
diff --git a/etc/Svc_Conf_l.cpp.diff b/etc/Svc_Conf_l.cpp.diff
index bda20aa37cb..229d82fd8bd 100644
--- a/etc/Svc_Conf_l.cpp.diff
+++ b/etc/Svc_Conf_l.cpp.diff
@@ -1,5 +1,5 @@
---- Svc_Conf_l.cpp	Thu Nov 15 20:41:55 2001
-+++ /tmp/new/Svc_Conf_l.cpp	Thu Nov 15 20:37:24 2001
+--- Svc_Conf_l.cpp	Sun Nov 18 22:46:25 2001
++++ Svc_Conf_l.cpp.new	Sun Nov 18 22:43:21 2001
 @@ -1,17 +1,14 @@
 +#define ACE_YY_NO_UNPUT
  /* A lexical scanner generated by flex */
@@ -558,7 +558,7 @@
  	/* 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 );
++	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()" ));
diff --git a/etc/Svc_Conf_y.cpp.diff b/etc/Svc_Conf_y.cpp.diff
index f39cddfd5d3..af80ecff605 100644
--- a/etc/Svc_Conf_y.cpp.diff
+++ b/etc/Svc_Conf_y.cpp.diff
@@ -1,24 +1,139 @@
---- Svc_Conf_y.cpp	Thu Nov 15 20:54:12 2001
-+++ /tmp/new/Svc_Conf_y.cpp	Thu Nov 15 20:01:01 2001
-@@ -20,7 +20,7 @@
- #define	ACE_STRING	270
+--- Svc_Conf_y.cpp	Sun Nov 18 23:59:11 2001
++++ Svc_Conf_y.cpp.new	Mon Nov 19 00:07:29 2001
+@@ -61,7 +61,7 @@
  
+ #define ACE_YYTRANSLATE(x) ((unsigned)(x) <= 270 ? ace_yytranslate[x] : 43)
  
--// $Id: Svc_Conf.y,v 4.41 2001/10/17 06:14:08 othman Exp $
-+// $Id: Svc_Conf_y.cpp,v 4.62 2001/11/15 04:27:01 crodrigu Exp $
+-static const char ace_yytranslate[] = {     0,
++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,     2,
+      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+@@ -130,13 +130,51 @@
  
- #include "ace/ARGV.h"
- #include "ace/Svc_Conf.h"
-@@ -29,7 +29,7 @@
+ #if ACE_YYDEBUG != 0 || defined (ACE_YYERROR_VERBOSE)
  
- ACE_RCSID (ace,
-            Svc_Conf_y,
--           "$Id: Svc_Conf.y,v 4.41 2001/10/17 06:14:08 othman Exp $")
-+           "$Id: Svc_Conf_y.cpp,v 4.62 2001/11/15 04:27:01 crodrigu Exp $")
+-static const char * 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", NULL
++static const ACE_TCHAR * const ace_yytname[] = { 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"),
++                                                 NULL
+ };
+ #endif
  
- // Prototypes.
- static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec,
-@@ -568,7 +568,7 @@
+@@ -317,7 +355,7 @@
+       goto ace_yybackup;						\
+     }								\
+   else								\
+-    { ace_yyerror ("syntax error: cannot back up"); ACE_YYERROR; }	\
++    { ace_yyerror (ACE_LIB_TEXT("syntax error: cannot back up")); ACE_YYERROR; }	\
+ while (0)
+ 
+ #define ACE_YYTERROR	1
+@@ -396,12 +434,12 @@
+    in available built-in functions on various systems.  */
+ static void
+ __ace_yy_memcpy (to, from, count)
+-     char *to;
+-     char *from;
++     ACE_TCHAR *to;
++     ACE_TCHAR *from;
+      unsigned int count;
+ {
+-  register char *f = from;
+-  register char *t = to;
++  register ACE_TCHAR *f = from;
++  register ACE_TCHAR *t = to;
+   register int i = count;
+ 
+   while (i-- > 0)
+@@ -413,10 +451,10 @@
+ /* This is the most reliable way to avoid incompatibilities
+    in available built-in functions on various systems.  */
+ static void
+-__ace_yy_memcpy (char *to, char *from, unsigned int count)
++__ace_yy_memcpy (ACE_TCHAR *to, ACE_TCHAR *from, unsigned int count)
+ {
+-  register char *t = to;
+-  register char *f = from;
++  register ACE_TCHAR *t = to;
++  register ACE_TCHAR *f = from;
+   register int i = count;
+ 
+   while (i-- > 0)
+@@ -503,7 +541,7 @@
+ 
+ #if ACE_YYDEBUG != 0
+   if (ace_yydebug)
+-    ACE_OS::fprintf(stderr, "Starting parse\n");
++    ACE_OS::fprintf(stderr, ACE_LIB_TEXT("Starting parse\n"));
+ #endif
+ 
+   ace_yystate = 0;
+@@ -548,13 +586,13 @@
+ #ifdef ACE_YYLSP_NEEDED
+       /* 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, size * sizeof (*ace_yyssp),
+ 		 &ace_yyvs1, size * sizeof (*ace_yyvsp),
+ 		 &ace_yyls1, size * sizeof (*ace_yylsp),
+ 		 &ace_yystacksize);
+ #else
+-      ace_yyoverflow("parser stack overflow",
++      ace_yyoverflow(ACE_LIB_TEXT("parser stack overflow"),
+ 		 &ace_yyss1, size * sizeof (*ace_yyssp),
+ 		 &ace_yyvs1, size * sizeof (*ace_yyvsp),
+ 		 &ace_yystacksize);
+@@ -568,7 +606,7 @@
        /* Extend the stack our own way.  */
        if (ace_yystacksize >= ACE_YYMAXDEPTH)
  	{
@@ -27,8 +142,159 @@
  	  if (ace_yyfree_stacks)
  	    {
  	      free (ace_yyss);
-@@ -1098,11 +1098,11 @@
- 	      free(msg);
+@@ -586,14 +624,14 @@
+       ace_yyfree_stacks = 1;
+ #endif
+       ace_yyss = (short *) ACE_YYSTACK_ALLOC (ace_yystacksize * sizeof (*ace_yyssp));
+-      __ace_yy_memcpy ((char *)ace_yyss, (char *)ace_yyss1,
++      __ace_yy_memcpy ((ACE_TCHAR *)ace_yyss, (ACE_TCHAR *)ace_yyss1,
+ 		   size * (unsigned int) sizeof (*ace_yyssp));
+       ace_yyvs = (ACE_YYSTYPE *) ACE_YYSTACK_ALLOC (ace_yystacksize * sizeof (*ace_yyvsp));
+-      __ace_yy_memcpy ((char *)ace_yyvs, (char *)ace_yyvs1,
++      __ace_yy_memcpy ((ACE_TCHAR *)ace_yyvs, (ACE_TCHAR *)ace_yyvs1,
+ 		   size * (unsigned int) sizeof (*ace_yyvsp));
+ #ifdef ACE_YYLSP_NEEDED
+       ace_yyls = (ACE_YYLTYPE *) ACE_YYSTACK_ALLOC (ace_yystacksize * sizeof (*ace_yylsp));
+-      __ace_yy_memcpy ((char *)ace_yyls, (char *)ace_yyls1,
++      __ace_yy_memcpy ((ACE_TCHAR *)ace_yyls, (ACE_TCHAR *)ace_yyls1,
+ 		   size * (unsigned int) sizeof (*ace_yylsp));
+ #endif
+ #endif /* no ace_yyoverflow */
+@@ -606,7 +644,7 @@
+ 
+ #if ACE_YYDEBUG != 0
+       if (ace_yydebug)
+-	ACE_OS::fprintf(stderr, "Stack size increased to %d\n", ace_yystacksize);
++	ACE_OS::fprintf(stderr, ACE_LIB_TEXT("Stack size increased to %d\n"), ace_yystacksize);
+ #endif
+ 
+       if (ace_yyssp >= ace_yyss + ace_yystacksize - 1)
+@@ -615,7 +653,7 @@
+ 
+ #if ACE_YYDEBUG != 0
+   if (ace_yydebug)
+-    ACE_OS::fprintf(stderr, "Entering state %d\n", ace_yystate);
++    ACE_OS::fprintf(stderr, ACE_LIB_TEXT("Entering state %d\n"), ace_yystate);
+ #endif
+ 
+   goto ace_yybackup;
+@@ -640,7 +678,7 @@
+     {
+ #if ACE_YYDEBUG != 0
+       if (ace_yydebug)
+-	ACE_OS::fprintf(stderr, "Reading a token: ");
++	ACE_OS::fprintf(stderr, ACE_LIB_TEXT("Reading a token: "));
+ #endif
+       ace_yychar = ACE_YYLEX;
+     }
+@@ -654,7 +692,7 @@
+ 
+ #if ACE_YYDEBUG != 0
+       if (ace_yydebug)
+-	ACE_OS::fprintf(stderr, "Now at end of input.\n");
++	ACE_OS::fprintf(stderr, ACE_LIB_TEXT("Now at end of input.\n"));
+ #endif
+     }
+   else
+@@ -664,13 +702,13 @@
+ #if ACE_YYDEBUG != 0
+       if (ace_yydebug)
+ 	{
+-	  ACE_OS::fprintf (stderr, "Next token is %d (%s", ace_yychar, ace_yytname[ace_yychar1]);
++	  ACE_OS::fprintf (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_OS::fprintf (stderr, ")\n");
++	  ACE_OS::fprintf (stderr, ACE_LIB_TEXT(")\n"));
+ 	}
+ #endif
+     }
+@@ -705,7 +743,7 @@
+ 
+ #if ACE_YYDEBUG != 0
+   if (ace_yydebug)
+-    ACE_OS::fprintf(stderr, "Shifting token %d (%s), ", ace_yychar, ace_yytname[ace_yychar1]);
++    ACE_OS::fprintf(stderr, ACE_LIB_TEXT("Shifting token %d (%s), "), ace_yychar, ace_yytname[ace_yychar1]);
+ #endif
+ 
+   /* Discard the token being shifted unless it is eof.  */
+@@ -741,13 +779,13 @@
+     {
+       int i;
+ 
+-      ACE_OS::fprintf (stderr, "Reducing via rule %d (line %d), ",
++      ACE_OS::fprintf (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 (i = ace_yyprhs[ace_yyn]; ace_yyrhs[i] > 0; i++)
+-	ACE_OS::fprintf (stderr, "%s ", ace_yytname[ace_yyrhs[i]]);
+-      ACE_OS::fprintf (stderr, " -> %s\n", ace_yytname[ace_yyr1[ace_yyn]]);
++	ACE_OS::fprintf (stderr, ACE_LIB_TEXT("%s "), ace_yytname[ace_yyrhs[i]]);
++      ACE_OS::fprintf (stderr, ACE_LIB_TEXT(" -> %s\n"), ace_yytname[ace_yyr1[ace_yyn]]);
+     }
+ #endif
+ 
+@@ -1013,10 +1051,10 @@
+   if (ace_yydebug)
+     {
+       short *ssp1 = ace_yyss - 1;
+-      ACE_OS::fprintf (stderr, "state stack now");
++      ACE_OS::fprintf (stderr, ACE_LIB_TEXT("state stack now"));
+       while (ssp1 != ace_yyssp)
+-	ACE_OS::fprintf (stderr, " %d", *++ssp1);
+-      ACE_OS::fprintf (stderr, "\n");
++	ACE_OS::fprintf (stderr, ACE_LIB_TEXT(" %d"), *++ssp1);
++      ACE_OS::fprintf (stderr, ACE_LIB_TEXT("\n"));
+     }
+ #endif
+ 
+@@ -1067,42 +1105,42 @@
+       if (ace_yyn > ACE_YYFLAG && ace_yyn < ACE_YYLAST)
+ 	{
+ 	  int size = 0;
+-	  char *msg;
++	  ACE_TCHAR *msg;
+ 	  int x, count;
+ 
+ 	  count = 0;
+ 	  /* Start X at -ace_yyn if nec to avoid negative indexes in ace_yycheck.  */
+ 	  for (x = (ace_yyn < 0 ? -ace_yyn : 0);
+-	       x < (sizeof(ace_yytname) / sizeof(char *)); x++)
++	       x < (sizeof(ace_yytname) / sizeof(ACE_TCHAR *)); x++)
+ 	    if (ace_yycheck[x + ace_yyn] == x)
+-	      size += strlen(ace_yytname[x]) + 15, count++;
+-	  msg = (char *) malloc(size + 15);
++	      size += ACE_OS::strlen(ace_yytname[x]) + 15, count++;
++	  msg = new ACE_TCHAR[size + 15];
+ 	  if (msg != 0)
+ 	    {
+-	      strcpy(msg, "parse error");
++	      ACE_OS::strcpy(msg, ACE_LIB_TEXT("parse error"));
+ 
+ 	      if (count < 5)
+ 		{
+ 		  count = 0;
+ 		  for (x = (ace_yyn < 0 ? -ace_yyn : 0);
+-		       x < (sizeof(ace_yytname) / sizeof(char *)); x++)
++		       x < (sizeof(ace_yytname) / sizeof(ACE_TCHAR *)); x++)
+ 		    if (ace_yycheck[x + ace_yyn] == x)
+ 		      {
+-			strcat(msg, count == 0 ? ", expecting `" : " or `");
+-			strcat(msg, ace_yytname[x]);
+-			strcat(msg, "'");
++			ACE_OS::strcat(msg, count == 0 ? ACE_LIB_TEXT(", expecting `") : ACE_LIB_TEXT(" or `"));
++			ACE_OS::strcat(msg, ACE_TEXT_CHAR_TO_TCHAR (ace_yytname[x]));
++			ACE_OS::strcat(msg, ACE_LIB_TEXT("'"));
+ 			count++;
+ 		      }
+ 		}
+ 	      ace_yyerror(msg);
+-	      free(msg);
++	      delete [] msg;
  	    }
  	  else
 -	    ace_yyerror ("parse error; also virtual memory exceeded");
@@ -41,3 +307,52 @@
      }
  
    goto ace_yyerrlab1;
+@@ -1118,7 +1156,7 @@
+ 
+ #if ACE_YYDEBUG != 0
+       if (ace_yydebug)
+-	ACE_OS::fprintf(stderr, "Discarding token %d (%s).\n", ace_yychar, ace_yytname[ace_yychar1]);
++	ACE_OS::fprintf(stderr, ACE_LIB_TEXT("Discarding token %d (%s).\n"), ace_yychar, ace_yytname[ace_yychar1]);
+ #endif
+ 
+       ace_yychar = ACE_YYEMPTY;
+@@ -1153,10 +1191,10 @@
+   if (ace_yydebug)
+     {
+       short *ssp1 = ace_yyss - 1;
+-      ACE_OS::fprintf (stderr, "Error: state stack now");
++      ACE_OS::fprintf (stderr, ACE_LIB_TEXT("Error: state stack now"));
+       while (ssp1 != ace_yyssp)
+-	ACE_OS::fprintf (stderr, " %d", *++ssp1);
+-      ACE_OS::fprintf (stderr, "\n");
++	ACE_OS::fprintf (stderr, ACE_LIB_TEXT(" %d"), *++ssp1);
++      ACE_OS::fprintf (stderr, ACE_LIB_TEXT("\n"));
+     }
+ #endif
+ 
+@@ -1186,7 +1224,7 @@
+ 
+ #if ACE_YYDEBUG != 0
+   if (ace_yydebug)
+-    ACE_OS::fprintf(stderr, "Shifting error token, ");
++    ACE_OS::fprintf(stderr, ACE_LIB_TEXT("Shifting error token, "));
+ #endif
+ 
+   *++ace_yyvsp = ace_yylval;
+@@ -1355,13 +1393,13 @@
+ // Main driver program.
+ 
+ int
+-main (int argc, char *argv[])
++main (int argc, ACE_TCHAR *argv[])
+ {
+   ACE_Svc_Conf_Param param (stdin);
+ 
+   // Try to reopen any filename argument to use ACE_YYIN.
+-  if (argc > 1 && (ace_yyin = freopen (argv[1], "r", stdin)) == 0)
+-    (void) ::ACE_OS::fprintf (stderr, "usage: %s [file]\n", argv[0]), ACE_OS::exit (1);
++  if (argc > 1 && (ace_yyin = freopen (argv[1], ACE_LIB_TEXT("r"), stdin)) == 0)
++    ACE_OS::fprintf (stderr, ACE_LIB_TEXT("usage: %s [file]\n"), argv[0]), ACE_OS::exit (1);
+ 
+   return ace_yyparse (&param);
+ }
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index 6fa3c55ba3d..3c0b386445c 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -266,7 +266,7 @@ endif
 
 # NOTE: VLDLIBS is defined below, in case it is overridden for static-
 #       or shared-only builds.
-YACC            = yacc
+YACC            = bison
 
 # Define SOEXT trailing digits if platform needs it.
 ifeq ($(versioned_so),1)