ChangeLogTag:Fri Jul 27 11:24:50 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>

16 files changed, 1030 insertions, 932 deletions

diff --git a/ChangeLog b/ChangeLog
index 60522b56ab4..f8cae1aba20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+Fri Jul 27 11:24:50 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/Svc_Conf.y: Allow quoted strings as the pathname.  Thanks
+	  to Kevin Burge <kcburge@systemware-inc.com> for suggesting this
+ 	  and providing the fix.
+
+	* ace/Svc_Conf.l: Added support for "~" in pathnames to support
+	  Win32isms.  Thanks to Kevin Burge <kcburge@systemware-inc.com>
+ 	  for suggesting this and providing the fix.
+
+	* ace/Refcounted_Auto_Ptr.i (assign): Fixed the code to avoid a
+	  race condition.  Thanks to Charlie Duke for this fix.
+
+Thu Jul 26 08:15:36 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* include/makeinclude/platform_vxworks5.x_g++.GNU: Changed
+	  $PATH to $(PATH).  Thanks to Frank Wolf for reporting this.
+
+Wed Jul 25 17:46:58 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/Asynch_Acceptor.{h,cpp}: Added an asynch_accept() accessor
+	  method.  Thanks to Craig L. Ching <cching@mqsoftware.com> for
+ 	  reporting this.
+
+Wed Jul 25 17:36:09 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/Refcounted_Auto_Ptr.i: Added a lock for the reference count
+	  to the assign() method.  Thanks to Charlie Duke
+ 	  <cduke@cuseeme.com> for reporting this.
+
 Fri Jul 27 23:17:31 2001  Steve Huston  <shuston@riverace.com>
 
         * ace/ace_wchar.h: If ACE_HAS_XPG4_MULTIBYTE_CHAR is set, then
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 60522b56ab4..f8cae1aba20 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,33 @@
+Fri Jul 27 11:24:50 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/Svc_Conf.y: Allow quoted strings as the pathname.  Thanks
+	  to Kevin Burge <kcburge@systemware-inc.com> for suggesting this
+ 	  and providing the fix.
+
+	* ace/Svc_Conf.l: Added support for "~" in pathnames to support
+	  Win32isms.  Thanks to Kevin Burge <kcburge@systemware-inc.com>
+ 	  for suggesting this and providing the fix.
+
+	* ace/Refcounted_Auto_Ptr.i (assign): Fixed the code to avoid a
+	  race condition.  Thanks to Charlie Duke for this fix.
+
+Thu Jul 26 08:15:36 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* include/makeinclude/platform_vxworks5.x_g++.GNU: Changed
+	  $PATH to $(PATH).  Thanks to Frank Wolf for reporting this.
+
+Wed Jul 25 17:46:58 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/Asynch_Acceptor.{h,cpp}: Added an asynch_accept() accessor
+	  method.  Thanks to Craig L. Ching <cching@mqsoftware.com> for
+ 	  reporting this.
+
+Wed Jul 25 17:36:09 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/Refcounted_Auto_Ptr.i: Added a lock for the reference count
+	  to the assign() method.  Thanks to Charlie Duke
+ 	  <cduke@cuseeme.com> for reporting this.
+
 Fri Jul 27 23:17:31 2001  Steve Huston  <shuston@riverace.com>
 
         * ace/ace_wchar.h: If ACE_HAS_XPG4_MULTIBYTE_CHAR is set, then
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 60522b56ab4..f8cae1aba20 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,33 @@
+Fri Jul 27 11:24:50 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/Svc_Conf.y: Allow quoted strings as the pathname.  Thanks
+	  to Kevin Burge <kcburge@systemware-inc.com> for suggesting this
+ 	  and providing the fix.
+
+	* ace/Svc_Conf.l: Added support for "~" in pathnames to support
+	  Win32isms.  Thanks to Kevin Burge <kcburge@systemware-inc.com>
+ 	  for suggesting this and providing the fix.
+
+	* ace/Refcounted_Auto_Ptr.i (assign): Fixed the code to avoid a
+	  race condition.  Thanks to Charlie Duke for this fix.
+
+Thu Jul 26 08:15:36 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* include/makeinclude/platform_vxworks5.x_g++.GNU: Changed
+	  $PATH to $(PATH).  Thanks to Frank Wolf for reporting this.
+
+Wed Jul 25 17:46:58 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/Asynch_Acceptor.{h,cpp}: Added an asynch_accept() accessor
+	  method.  Thanks to Craig L. Ching <cching@mqsoftware.com> for
+ 	  reporting this.
+
+Wed Jul 25 17:36:09 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/Refcounted_Auto_Ptr.i: Added a lock for the reference count
+	  to the assign() method.  Thanks to Charlie Duke
+ 	  <cduke@cuseeme.com> for reporting this.
+
 Fri Jul 27 23:17:31 2001  Steve Huston  <shuston@riverace.com>
 
         * ace/ace_wchar.h: If ACE_HAS_XPG4_MULTIBYTE_CHAR is set, then
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index a0c96271c35..ec1b8e07c2a 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Wed Jul 25 23:48:58 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* tests/Blocking_Sync_None/client.cpp (main): Changed an 
+	  error messages so that the "Right Thing[TM]" will happen when
+ 	  this test fails, i.e., the build system will automagically
+ 	  detect it.  Thanks to Johnny Willemsen for reportng this.
+
 Fri Jul 27 21:48:12 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl: Removed all
diff --git a/TAO/tests/Blocking_Sync_None/client.cpp b/TAO/tests/Blocking_Sync_None/client.cpp
index ad5979bff08..72ac3fcc768 100644
--- a/TAO/tests/Blocking_Sync_None/client.cpp
+++ b/TAO/tests/Blocking_Sync_None/client.cpp
@@ -61,12 +61,10 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (blocking_sync_none.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_DEBUG,
-                             "Nil Test::Blocking_Sync_None reference <%s>\n",
-                             ior),
-                            1);
-        }
+        ACE_ERROR_RETURN ((LM_DEBUG,
+                           "ERROR: Nil reference in Blocking_Sync_None reference <%s>\n",
+                           ior),
+                          1);
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("PolicyCurrent", ACE_TRY_ENV);
diff --git a/THANKS b/THANKS
index 162b8bb61e3..a9eb60ccfe7 100644
--- a/THANKS
+++ b/THANKS
@@ -860,7 +860,7 @@ Pierre Oberson <oberson@nagra-kudelski.ch>
 Chris Uzdavinis <chris@atdesk.com>
 Ishay Green <ishaygreen@hotmail.com>
 Andrey Nechypurenko <andreynech@yahoo.com>
-Charlie Duke <cduke@wpine.com>
+Charlie Duke <cduke@cuseeme.com>
 Jonathan Luellen <jluellen@scires.com>
 Andrew Psaltis <apsaltis@mho.net>
 Erik Jones <ej@pcslink.com>
diff --git a/ace/Asynch_Acceptor.cpp b/ace/Asynch_Acceptor.cpp
index 74082ffe811..08f625e86c7 100644
--- a/ace/Asynch_Acceptor.cpp
+++ b/ace/Asynch_Acceptor.cpp
@@ -414,6 +414,12 @@ ACE_Asynch_Acceptor<HANDLER>::handle (ACE_HANDLE h)
   ACE_Handler::handle (h);
 }
 
+template <class HANDLER> ACE_Asynch_Accept &
+ACE_Asynch_Acceptor<HANDLER>::asynch_accept (void)
+{
+  return this->asynch_accept_;
+}
+
 template <class HANDLER> HANDLER *
 ACE_Asynch_Acceptor<HANDLER>::make_handler (void)
 {
diff --git a/ace/Asynch_Acceptor.h b/ace/Asynch_Acceptor.h
index adc5e34d892..f2a0db738e9 100644
--- a/ace/Asynch_Acceptor.h
+++ b/ace/Asynch_Acceptor.h
@@ -158,6 +158,9 @@ protected:
                       ACE_INET_Addr &remote_address,
                       ACE_INET_Addr &local_address);
 
+  /// Return the asynch accept object.
+  ACE_Asynch_Accept &asynch_accept (void);
+
   /**
    * This is the template method used to create new handler.
    * Subclasses must overwrite this method if a new handler creation
diff --git a/ace/High_Res_Timer.h b/ace/High_Res_Timer.h
index 19626a7d298..84d64f70bc8 100644
--- a/ace/High_Res_Timer.h
+++ b/ace/High_Res_Timer.h
@@ -6,11 +6,10 @@
  *
  *  $Id$
  *
- *  @author Doug Schmidt
+ *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
 //=============================================================================
 
-
 #ifndef ACE_HIGH_RES_TIMER_H
 #define ACE_HIGH_RES_TIMER_H
 #include "ace/pre.h"
diff --git a/ace/Refcounted_Auto_Ptr.i b/ace/Refcounted_Auto_Ptr.i
index 67763e3ae39..34ff9fcc10f 100644
--- a/ace/Refcounted_Auto_Ptr.i
+++ b/ace/Refcounted_Auto_Ptr.i
@@ -65,17 +65,19 @@ ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::assign (ACE_Refcounted_Auto_Ptr_Rep<X,
   ACE_ASSERT (rep != 0);
   ACE_ASSERT (new_rep != 0);
 
-  ACE_GUARD (ACE_LOCK, guard, rep->lock_);
-
-  ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK> *old = rep;
-  rep = new_rep;
-
-  // detached old last for exception safety
-  if(old->ref_count_-- == 0)
-    // We do not need the lock when deleting the representation.
-    // There should be no side effects from deleting rep and we don
-    // not want to release a deleted mutex.
-    delete old;
+  ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK> *old = 0;
+  {
+    // detached old last for exception safety
+    ACE_GUARD (ACE_LOCK, guard, rep->lock_);
+    old = rep;
+    rep = new_rep;
+ 
+    if (old->ref_count_-- > 0)
+      return;
+ 
+  } // The lock is released before deleting old rep object below.
+ 
+  delete old;
 }
 
 template <class X, class ACE_LOCK> inline
diff --git a/ace/Svc_Conf.l b/ace/Svc_Conf.l
index 89605cdb3a2..dfd34d309d8 100644
--- a/ace/Svc_Conf.l
+++ b/ace/Svc_Conf.l
@@ -29,7 +29,7 @@ letter	        [a-zA-Z_]
 letter_or_digit	[a-zA-Z_0-9]
 digit           [0-9]
 ident           {letter}{letter_or_digit}*
-pathname        ([A-Za-z\%]:)?[a-zA-Z_0-9/\%\.\\-]+
+pathname        ([A-Za-z\%]:)?[a-zA-Z_0-9/\%\.\\~-]+
 symbol		[ -~]
 string		(\"{symbol}*\"|\'{symbol}*\')
 white_space	[ \t]
diff --git a/ace/Svc_Conf.y b/ace/Svc_Conf.y
index fe45f8c4c1e..13688326f4b 100644
--- a/ace/Svc_Conf.y
+++ b/ace/Svc_Conf.y
@@ -308,6 +308,7 @@ parameters_opt
 pathname
   : ACE_PATHNAME
   | ACE_IDENT
+  | ACE_STRING
   ;
 
 %%
diff --git a/ace/Svc_Conf_Tokens.h b/ace/Svc_Conf_Tokens.h
index 98a63ac0e53..f8998fc827d 100644
--- a/ace/Svc_Conf_Tokens.h
+++ b/ace/Svc_Conf_Tokens.h
@@ -1,9 +1,4 @@
 // $Id$
-
-#ifndef SVC_CONF_TOKENS_H
-#define SVC_CONF_TOKENS_H
-#include "ace/pre.h"
-
 #define ACE_DYNAMIC 257
 #define ACE_STATIC 258
 #define ACE_SUSPEND 259
@@ -24,6 +19,3 @@
 #define ACE_RBRACE 274
 #define ACE_STAR 275
 #define ACE_COLON 276
-
-#include "ace/post.h"
-#endif //SVC_CONF_TOKENS_H
diff --git a/ace/Svc_Conf_l.cpp b/ace/Svc_Conf_l.cpp
index bb738e1678f..21251c4713f 100644
--- a/ace/Svc_Conf_l.cpp
+++ b/ace/Svc_Conf_l.cpp
@@ -1,5 +1,4 @@
 /* A lexical scanner generated by flex */
-#define ACE_YY_NO_UNPUT
 
 /* Scanner skeleton version:
  * $Header$
@@ -31,15 +30,15 @@
 /* The "const" storage-class-modifier is valid. */
 #define ACE_YY_USE_CONST
 
-#else   /* ! __cplusplus */
+#else	/* ! __cplusplus */
 
 #if __STDC__
 
 #define ACE_YY_USE_PROTOS
 #define ACE_YY_USE_CONST
 
-#endif  /* __STDC__ */
-#endif  /* ! __cplusplus */
+#endif	/* __STDC__ */
+#endif	/* ! __cplusplus */
 
 #ifdef __TURBOC__
  #pragma warn -rch
@@ -66,9 +65,9 @@
 /* Returned upon end-of-file. */
 #define ACE_YY_NULL 0
 
-/* Promotes a possibly negative, possibly signed ACE_TCHAR to an unsigned
- * integer for use as an array index.  If the signed ACE_TCHAR is negative,
- * we want to instead treat it as an 8-bit unsigned ACE_TCHAR, hence the
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
  * double cast.
  */
 #define ACE_YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
@@ -110,10 +109,10 @@ extern FILE *ace_yyin, *ace_yyout;
  * int a single C statement (which needs a semi-colon terminator).  This
  * avoids problems with code like:
  *
- *      if ( condition_holds )
- *              ace_yyless( 5 );
- *      else
- *              do_something_else();
+ * 	if ( condition_holds )
+ *		ace_yyless( 5 );
+ *	else
+ *		do_something_else();
  *
  * Prior to using the do-while the compiler would get upset at the
  * "else" because it interpreted the "if" statement as being all
@@ -123,19 +122,17 @@ extern FILE *ace_yyin, *ace_yyout;
 /* Return all but the first 'n' matched characters back to the input stream. */
 
 #define ace_yyless(n) \
-        do \
-                { \
-                /* Undo effects of setting up ace_yytext. */ \
-                *ace_yy_cp = ace_yy_hold_char; \
-                ACE_YY_RESTORE_ACE_YY_MORE_OFFSET \
-                ace_yy_c_buf_p = ace_yy_cp = ace_yy_bp + n - ACE_YY_MORE_ADJ; \
-                ACE_YY_DO_BEFORE_ACTION; /* set up ace_yytext again */ \
-                } \
-        while ( 0 )
-
-#if 0
+	do \
+		{ \
+		/* Undo effects of setting up ace_yytext. */ \
+		*ace_yy_cp = ace_yy_hold_char; \
+		ACE_YY_RESTORE_ACE_YY_MORE_OFFSET \
+		ace_yy_c_buf_p = ace_yy_cp = ace_yy_bp + n - ACE_YY_MORE_ADJ; \
+		ACE_YY_DO_BEFORE_ACTION; /* set up ace_yytext again */ \
+		} \
+	while ( 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
@@ -145,61 +142,61 @@ typedef unsigned int ace_yy_size_t;
 
 
 struct ace_yy_buffer_state
-        {
-        FILE *ace_yy_input_file;
-
-        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.
-         */
-        ace_yy_size_t ace_yy_buf_size;
-
-        /* Number of characters read into ace_yy_ch_buf, not including EOB
-         * characters.
-         */
-        int ace_yy_n_chars;
-
-        /* Whether we "own" the buffer - i.e., we know we created it,
-         * and can realloc() it to grow it, and should free() it to
-         * delete it.
-         */
-        int ace_yy_is_our_buffer;
-
-        /* Whether this is an "interactive" input source; if so, and
-         * if we're using stdio for input, then we want to use getc()
-         * instead of fread(), to make sure we stop fetching input after
-         * each newline.
-         */
-        int ace_yy_is_interactive;
-
-        /* Whether we're considered to be at the beginning of a line.
-         * If so, '^' rules will be active on the next match, otherwise
-         * not.
-         */
-        int ace_yy_at_bol;
-
-        /* Whether to try to fill the input buffer when we reach the
-         * end of it.
-         */
-        int ace_yy_fill_buffer;
-
-        int ace_yy_buffer_status;
+	{
+	FILE *ace_yy_input_file;
+
+	char *ace_yy_ch_buf;		/* input buffer */
+	char *ace_yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	ace_yy_size_t ace_yy_buf_size;
+
+	/* Number of characters read into ace_yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	int ace_yy_n_chars;
+
+	/* Whether we "own" the buffer - i.e., we know we created it,
+	 * and can realloc() it to grow it, and should free() it to
+	 * delete it.
+	 */
+	int ace_yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int ace_yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int ace_yy_at_bol;
+
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int ace_yy_fill_buffer;
+
+	int ace_yy_buffer_status;
 #define ACE_YY_BUFFER_NEW 0
 #define ACE_YY_BUFFER_NORMAL 1
-        /* When an EOF's been seen but there's still some text to process
-         * then we mark the buffer as ACE_YY_EOF_PENDING, to indicate that we
-         * shouldn't try reading from the input source any more.  We might
-         * still have a bunch of tokens to match, though, because of
-         * possible backing-up.
-         *
-         * When we actually see the EOF, we change the status to "new"
-         * (via ace_yyrestart()), so that the user can continue scanning by
-         * just pointing ace_yyin at a new input file.
-         */
+	/* When an EOF's been seen but there's still some text to process
+	 * then we mark the buffer as ACE_YY_EOF_PENDING, to indicate that we
+	 * shouldn't try reading from the input source any more.  We might
+	 * still have a bunch of tokens to match, though, because of
+	 * possible backing-up.
+	 *
+	 * When we actually see the EOF, we change the status to "new"
+	 * (via ace_yyrestart()), so that the user can continue scanning by
+	 * just pointing ace_yyin at a new input file.
+	 */
 #define ACE_YY_BUFFER_EOF_PENDING 2
-        };
+	};
 
 static ACE_YY_BUFFER_STATE ace_yy_current_buffer = 0;
 
@@ -211,17 +208,17 @@ static ACE_YY_BUFFER_STATE ace_yy_current_buffer = 0;
 
 
 /* ace_yy_hold_char holds the character lost when ace_yytext is formed. */
-static ACE_TCHAR ace_yy_hold_char;
+static char ace_yy_hold_char;
 
-static int ace_yy_n_chars;              /* number of characters read into ace_yy_ch_buf */
+static int ace_yy_n_chars;		/* number of characters read into ace_yy_ch_buf */
 
 
 int ace_yyleng;
 
 /* Points to current character in buffer. */
-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 */
+static char *ace_yy_c_buf_p = (char *) 0;
+static int ace_yy_init = 1;		/* whether we need to initialize */
+static int ace_yy_start = 0;	/* start state number */
 
 /* Flag which is used to allow ace_yywrap()'s to do buffer switches
  * instead of setting up a fresh ace_yyin.  A bit of a hack ...
@@ -238,9 +235,9 @@ void ace_yy_init_buffer ACE_YY_PROTO(( ACE_YY_BUFFER_STATE b, FILE *file ));
 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(( 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 ));
+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 ));
 
 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 ));
@@ -249,41 +246,41 @@ static void ace_yy_flex_free ACE_YY_PROTO(( void * ));
 #define ace_yy_new_buffer ace_yy_create_buffer
 
 #define ace_yy_set_interactive(is_interactive) \
-        { \
-        if ( ! ace_yy_current_buffer ) \
-                ace_yy_current_buffer = ace_yy_create_buffer( ace_yyin, ACE_YY_BUF_SIZE ); \
-        ace_yy_current_buffer->ace_yy_is_interactive = is_interactive; \
-        }
+	{ \
+	if ( ! ace_yy_current_buffer ) \
+		ace_yy_current_buffer = ace_yy_create_buffer( ace_yyin, ACE_YY_BUF_SIZE ); \
+	ace_yy_current_buffer->ace_yy_is_interactive = is_interactive; \
+	}
 
 #define ace_yy_set_bol(at_bol) \
-        { \
-        if ( ! ace_yy_current_buffer ) \
-                ace_yy_current_buffer = ace_yy_create_buffer( ace_yyin, ACE_YY_BUF_SIZE ); \
-        ace_yy_current_buffer->ace_yy_at_bol = at_bol; \
-        }
+	{ \
+	if ( ! ace_yy_current_buffer ) \
+		ace_yy_current_buffer = ace_yy_create_buffer( ace_yyin, ACE_YY_BUF_SIZE ); \
+	ace_yy_current_buffer->ace_yy_at_bol = at_bol; \
+	}
 
 #define ACE_YY_AT_BOL() (ace_yy_current_buffer->ace_yy_at_bol)
 
-typedef ACE_TCHAR ACE_YY_CHAR;
+typedef unsigned char ACE_YY_CHAR;
 FILE *ace_yyin = (FILE *) 0, *ace_yyout = (FILE *) 0;
 typedef int ace_yy_state_type;
-extern ACE_TCHAR *ace_yytext;
+extern char *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 ACE_TCHAR msg[] ));
+static void ace_yy_fatal_error ACE_YY_PROTO(( ace_yyconst char msg[] ));
 
 /* Done after the current pattern has been matched and before the
  * corresponding action - sets up ace_yytext.
  */
 #define ACE_YY_DO_BEFORE_ACTION \
-        ace_yytext_ptr = ace_yy_bp; \
-        ace_yyleng = (int) (ace_yy_cp - ace_yy_bp); \
-        ace_yy_hold_char = *ace_yy_cp; \
-        *ace_yy_cp = '\0'; \
-        ace_yy_c_buf_p = ace_yy_cp;
+	ace_yytext_ptr = ace_yy_bp; \
+	ace_yyleng = (int) (ace_yy_cp - ace_yy_bp); \
+	ace_yy_hold_char = *ace_yy_cp; \
+	*ace_yy_cp = '\0'; \
+	ace_yy_c_buf_p = ace_yy_cp;
 
 #define ACE_YY_NUM_RULES 25
 #define ACE_YY_END_OF_BUFFER 26
@@ -318,7 +315,7 @@ static ace_yyconst int ace_yy_ec[256] =
 
        29,   17,   17,   17,   30,   31,   17,   32,   33,   34,
        35,   36,   17,   37,   38,   39,   40,   41,   17,   17,
-       42,   17,   43,    5,   44,    5,    1,    1,    1,    1,
+       42,   17,   43,    5,   44,   13,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -493,7 +490,7 @@ static ace_yyconst short int ace_yy_chk[482] =
     } ;
 
 static ace_yy_state_type ace_yy_last_accepting_state;
-static ACE_TCHAR *ace_yy_last_accepting_cpos;
+static char *ace_yy_last_accepting_cpos;
 
 /* The intent behind this definition is that it'll catch
  * any uses of REJECT which flex missed.
@@ -502,7 +499,7 @@ static ACE_TCHAR *ace_yy_last_accepting_cpos;
 #define ace_yymore() ace_yymore_used_but_not_detected
 #define ACE_YY_MORE_ADJ 0
 #define ACE_YY_RESTORE_ACE_YY_MORE_OFFSET
-ACE_TCHAR *ace_yytext;
+char *ace_yytext;
 #line 1 "Svc_Conf.l"
 #define INITIAL 0
 #line 2 "Svc_Conf.l"
@@ -545,15 +542,15 @@ extern int ace_yywrap ACE_YY_PROTO(( void ));
 #endif
 
 #ifndef ACE_YY_NO_UNPUT
-static void ace_yyunput ACE_YY_PROTO(( int c, ACE_TCHAR *buf_ptr ));
+static void ace_yyunput ACE_YY_PROTO(( int c, char *buf_ptr ));
 #endif
 
 #ifndef ace_yytext_ptr
-static void ace_yy_flex_strncpy ACE_YY_PROTO(( ACE_TCHAR *, ace_yyconst ACE_TCHAR *, int ));
+static void ace_yy_flex_strncpy ACE_YY_PROTO(( char *, ace_yyconst char *, int ));
 #endif
 
 #ifdef ACE_YY_NEED_STRLEN
-static int ace_yy_flex_strlen ACE_YY_PROTO(( ace_yyconst ACE_TCHAR * ));
+static int ace_yy_flex_strlen ACE_YY_PROTO(( ace_yyconst char * ));
 #endif
 
 #ifndef ACE_YY_NO_INPUT
@@ -618,21 +615,21 @@ ACE_YY_MALLOC_DECL
  */
 #ifndef ACE_YY_INPUT
 #define ACE_YY_INPUT(buf,result,max_size) \
-        if ( ace_yy_current_buffer->ace_yy_is_interactive ) \
-                { \
-                int c = '*', n; \
-                for ( n = 0; n < max_size && \
-                             (c = getc( ace_yyin )) != EOF && c != '\n'; ++n ) \
-                        buf[n] = (ACE_TCHAR) c; \
-                if ( c == '\n' ) \
-                        buf[n++] = (ACE_TCHAR) c; \
-                if ( c == EOF && ferror( ace_yyin ) ) \
-                        ACE_YY_FATAL_ERROR( "input in flex scanner failed" ); \
-                result = n; \
-                } \
-        else if ( ((result = fread( buf, 1, max_size, ace_yyin )) == 0) \
-                  && ferror( ace_yyin ) ) \
-                ACE_YY_FATAL_ERROR( "input in flex scanner failed" );
+	if ( ace_yy_current_buffer->ace_yy_is_interactive ) \
+		{ \
+		int c = '*', n; \
+		for ( n = 0; n < max_size && \
+			     (c = getc( ace_yyin )) != EOF && c != '\n'; ++n ) \
+			buf[n] = (char) c; \
+		if ( c == '\n' ) \
+			buf[n++] = (char) c; \
+		if ( c == EOF && ferror( ace_yyin ) ) \
+			ACE_YY_FATAL_ERROR( "input in flex scanner failed" ); \
+		result = n; \
+		} \
+	else if ( ((result = fread( buf, 1, max_size, ace_yyin )) == 0) \
+		  && ferror( ace_yyin ) ) \
+		ACE_YY_FATAL_ERROR( "input in flex scanner failed" );
 #endif
 
 /* No semi-colon after return; correct usage is to write "ace_yyterminate();" -
@@ -673,102 +670,102 @@ ACE_YY_MALLOC_DECL
 #endif
 
 #define ACE_YY_RULE_SETUP \
-        if ( ace_yyleng > 0 ) \
-                ace_yy_current_buffer->ace_yy_at_bol = \
-                                (ace_yytext[ace_yyleng - 1] == '\n'); \
-        ACE_YY_USER_ACTION
+	if ( ace_yyleng > 0 ) \
+		ace_yy_current_buffer->ace_yy_at_bol = \
+				(ace_yytext[ace_yyleng - 1] == '\n'); \
+	ACE_YY_USER_ACTION
 
 ACE_YY_DECL
-        {
-        register ace_yy_state_type ace_yy_current_state;
-        register ACE_TCHAR *ace_yy_cp = 0, *ace_yy_bp = 0;
-        register int ace_yy_act;
+	{
+	register ace_yy_state_type ace_yy_current_state;
+	register char *ace_yy_cp, *ace_yy_bp;
+	register int ace_yy_act;
 
 #line 39 "Svc_Conf.l"
 
 
 
-        if ( ace_yy_init )
-                {
-                ace_yy_init = 0;
+	if ( ace_yy_init )
+		{
+		ace_yy_init = 0;
 
 #ifdef ACE_YY_USER_INIT
-                ACE_YY_USER_INIT;
+		ACE_YY_USER_INIT;
 #endif
 
-                if ( ! ace_yy_start )
-                        ace_yy_start = 1;       /* first start state */
+		if ( ! ace_yy_start )
+			ace_yy_start = 1;	/* first start state */
 
-                if ( ! ace_yyin )
-                        ace_yyin = stdin;
+		if ( ! ace_yyin )
+			ace_yyin = stdin;
 
-                if ( ! ace_yyout )
-                        ace_yyout = stdout;
+		if ( ! ace_yyout )
+			ace_yyout = stdout;
 
-                if ( ! ace_yy_current_buffer )
-                        ace_yy_current_buffer =
-                                ace_yy_create_buffer( ace_yyin, ACE_YY_BUF_SIZE );
+		if ( ! ace_yy_current_buffer )
+			ace_yy_current_buffer =
+				ace_yy_create_buffer( ace_yyin, ACE_YY_BUF_SIZE );
 
-                ace_yy_load_buffer_state();
-                }
+		ace_yy_load_buffer_state();
+		}
 
-        while ( 1 )             /* loops until end-of-file is reached */
-                {
-                ace_yy_cp = ace_yy_c_buf_p;
+	while ( 1 )		/* loops until end-of-file is reached */
+		{
+		ace_yy_cp = ace_yy_c_buf_p;
 
-                /* Support of ace_yytext. */
-                *ace_yy_cp = ace_yy_hold_char;
+		/* Support of ace_yytext. */
+		*ace_yy_cp = ace_yy_hold_char;
 
-                /* ace_yy_bp points to the position in ace_yy_ch_buf of the start of
-                 * the current run.
-                 */
-                ace_yy_bp = ace_yy_cp;
+		/* ace_yy_bp points to the position in ace_yy_ch_buf of the start of
+		 * the current run.
+		 */
+		ace_yy_bp = ace_yy_cp;
 
-                ace_yy_current_state = ace_yy_start;
-                ace_yy_current_state += ACE_YY_AT_BOL();
+		ace_yy_current_state = ace_yy_start;
+		ace_yy_current_state += ACE_YY_AT_BOL();
 ace_yy_match:
-                do
-                        {
-                        register ACE_YY_CHAR ace_yy_c = ace_yy_ec[ACE_YY_SC_TO_UI(*ace_yy_cp)];
-                        if ( ace_yy_accept[ace_yy_current_state] )
-                                {
-                                ace_yy_last_accepting_state = ace_yy_current_state;
-                                ace_yy_last_accepting_cpos = ace_yy_cp;
-                                }
-                        while ( ace_yy_chk[ace_yy_base[ace_yy_current_state] + ace_yy_c] != ace_yy_current_state )
-                                {
-                                ace_yy_current_state = (int) ace_yy_def[ace_yy_current_state];
-                                if ( ace_yy_current_state >= 107 )
-                                        ace_yy_c = ace_yy_meta[(unsigned int) ace_yy_c];
-                                }
-                        ace_yy_current_state = ace_yy_nxt[ace_yy_base[ace_yy_current_state] + (unsigned int) ace_yy_c];
-                        ++ace_yy_cp;
-                        }
-                while ( ace_yy_base[ace_yy_current_state] != 437 );
+		do
+			{
+			register ACE_YY_CHAR ace_yy_c = ace_yy_ec[ACE_YY_SC_TO_UI(*ace_yy_cp)];
+			if ( ace_yy_accept[ace_yy_current_state] )
+				{
+				ace_yy_last_accepting_state = ace_yy_current_state;
+				ace_yy_last_accepting_cpos = ace_yy_cp;
+				}
+			while ( ace_yy_chk[ace_yy_base[ace_yy_current_state] + ace_yy_c] != ace_yy_current_state )
+				{
+				ace_yy_current_state = (int) ace_yy_def[ace_yy_current_state];
+				if ( ace_yy_current_state >= 107 )
+					ace_yy_c = ace_yy_meta[(unsigned int) ace_yy_c];
+				}
+			ace_yy_current_state = ace_yy_nxt[ace_yy_base[ace_yy_current_state] + (unsigned int) ace_yy_c];
+			++ace_yy_cp;
+			}
+		while ( ace_yy_base[ace_yy_current_state] != 437 );
 
 ace_yy_find_action:
-                ace_yy_act = ace_yy_accept[ace_yy_current_state];
-                if ( ace_yy_act == 0 )
-                        { /* have to back up */
-                        ace_yy_cp = ace_yy_last_accepting_cpos;
-                        ace_yy_current_state = ace_yy_last_accepting_state;
-                        ace_yy_act = ace_yy_accept[ace_yy_current_state];
-                        }
+		ace_yy_act = ace_yy_accept[ace_yy_current_state];
+		if ( ace_yy_act == 0 )
+			{ /* have to back up */
+			ace_yy_cp = ace_yy_last_accepting_cpos;
+			ace_yy_current_state = ace_yy_last_accepting_state;
+			ace_yy_act = ace_yy_accept[ace_yy_current_state];
+			}
 
-                ACE_YY_DO_BEFORE_ACTION;
+		ACE_YY_DO_BEFORE_ACTION;
 
 
-do_action:      /* This label is used only to access EOF actions. */
+do_action:	/* This label is used only to access EOF actions. */
 
 
-                switch ( ace_yy_act )
-        { /* beginning of action switch */
-                        case 0: /* must back up */
-                        /* undo the effects of ACE_YY_DO_BEFORE_ACTION */
-                        *ace_yy_cp = ace_yy_hold_char;
-                        ace_yy_cp = ace_yy_last_accepting_cpos;
-                        ace_yy_current_state = ace_yy_last_accepting_state;
-                        goto ace_yy_find_action;
+		switch ( ace_yy_act )
+	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of ACE_YY_DO_BEFORE_ACTION */
+			*ace_yy_cp = ace_yy_hold_char;
+			ace_yy_cp = ace_yy_last_accepting_cpos;
+			ace_yy_current_state = ace_yy_last_accepting_state;
+			goto ace_yy_find_action;
 
 case 1:
 *ace_yy_cp = ace_yy_hold_char; /* undo effects of setting up ace_yytext */
@@ -777,461 +774,463 @@ ACE_YY_DO_BEFORE_ACTION; /* set up ace_yytext again */
 ACE_YY_RULE_SETUP
 #line 41 "Svc_Conf.l"
 ; /* EMPTY */
-        ACE_YY_BREAK
+	ACE_YY_BREAK
 case 2:
 ACE_YY_RULE_SETUP
 #line 42 "Svc_Conf.l"
 { return token (ACE_DYNAMIC); }
-        //      ACE_YY_BREAK
+	ACE_YY_BREAK
 case 3:
 ACE_YY_RULE_SETUP
 #line 43 "Svc_Conf.l"
 { return token (ACE_STATIC); }
-//      ACE_YY_BREAK
+	ACE_YY_BREAK
 case 4:
 ACE_YY_RULE_SETUP
 #line 44 "Svc_Conf.l"
 { return token (ACE_SUSPEND); }
-//      ACE_YY_BREAK
+	ACE_YY_BREAK
 case 5:
 ACE_YY_RULE_SETUP
 #line 45 "Svc_Conf.l"
 { return token (ACE_RESUME); }
-//      ACE_YY_BREAK
+	ACE_YY_BREAK
 case 6:
 ACE_YY_RULE_SETUP
 #line 46 "Svc_Conf.l"
 { return token (ACE_REMOVE); }
-//      ACE_YY_BREAK
+	ACE_YY_BREAK
 case 7:
 ACE_YY_RULE_SETUP
 #line 47 "Svc_Conf.l"
 { return token (ACE_USTREAM); }
-//      ACE_YY_BREAK
+	ACE_YY_BREAK
 case 8:
 ACE_YY_RULE_SETUP
 #line 48 "Svc_Conf.l"
 { return token (ACE_MODULE_T); }
-//      ACE_YY_BREAK
+	ACE_YY_BREAK
 case 9:
 ACE_YY_RULE_SETUP
 #line 49 "Svc_Conf.l"
 { return token (ACE_SVC_OBJ_T); }
-//      ACE_YY_BREAK
+	ACE_YY_BREAK
 case 10:
 ACE_YY_RULE_SETUP
 #line 50 "Svc_Conf.l"
 { return token (ACE_STREAM_T); }
-//      ACE_YY_BREAK
+	ACE_YY_BREAK
 case 11:
 ACE_YY_RULE_SETUP
 #line 51 "Svc_Conf.l"
 { return token (ACE_ACTIVE); }
-//      ACE_YY_BREAK
+	ACE_YY_BREAK
 case 12:
 ACE_YY_RULE_SETUP
 #line 52 "Svc_Conf.l"
 { return token (ACE_INACTIVE); }
-//      ACE_YY_BREAK
+	ACE_YY_BREAK
 case 13:
 ACE_YY_RULE_SETUP
 #line 53 "Svc_Conf.l"
 { return token (ACE_COLON); }
-//      ACE_YY_BREAK
+	ACE_YY_BREAK
 case 14:
 ACE_YY_RULE_SETUP
 #line 54 "Svc_Conf.l"
 { return token (ACE_STAR); }
-//      ACE_YY_BREAK
+	ACE_YY_BREAK
 case 15:
 ACE_YY_RULE_SETUP
 #line 55 "Svc_Conf.l"
 { return token (ACE_LPAREN); }
-//      ACE_YY_BREAK
+	ACE_YY_BREAK
 case 16:
 ACE_YY_RULE_SETUP
 #line 56 "Svc_Conf.l"
 { return token (ACE_RPAREN); }
-//      ACE_YY_BREAK
+	ACE_YY_BREAK
 case 17:
 ACE_YY_RULE_SETUP
 #line 57 "Svc_Conf.l"
 { return token (ACE_LBRACE); }
-//      ACE_YY_BREAK
+	ACE_YY_BREAK
 case 18:
 ACE_YY_RULE_SETUP
 #line 58 "Svc_Conf.l"
 { return token (ACE_RBRACE); }
-//      ACE_YY_BREAK
+	ACE_YY_BREAK
 case 19:
 ACE_YY_RULE_SETUP
 #line 59 "Svc_Conf.l"
 { // Check for first type of string, i.e.,
-                        // "double quotes" delimited.
-                        ACE_TCHAR *s = ACE_OS::strrchr (ace_yytext, '"');
+                        // "double quotes" delimited.  
+                        char *s = strrchr (ace_yytext, '"');
                         if (s == 0)
                           // Check for second type of string, i.e.,
                           // 'single quotes' delimited.
-                          s = ACE_OS::strrchr (ace_yytext, '\'');
+                          s = strrchr (ace_yytext, '\'');
 
                         ACE_ASSERT (s != 0);
                         // Eliminate the opening and closing double or
                         // single quotes.
                         *s = '\0';
-                        ace_yyleng -= 1;
+			ace_yyleng -= 1;
                         ace_yylval.ident_ = ace_obstack->copy (ace_yytext + 1, ace_yyleng);
-                        return token (ACE_STRING); }
-//      ACE_YY_BREAK
+			return token (ACE_STRING); }
+	ACE_YY_BREAK
 case 20:
 ACE_YY_RULE_SETUP
 #line 74 "Svc_Conf.l"
 {
-                        ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng);
-                        return token (ACE_IDENT);
-                      }
-//      ACE_YY_BREAK
+		        ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng);
+			return token (ACE_IDENT);
+		      }
+	ACE_YY_BREAK
 case 21:
 ACE_YY_RULE_SETUP
 #line 78 "Svc_Conf.l"
 {
-                        ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng);
-                        return token (ACE_PATHNAME);
-                      }
-//      ACE_YY_BREAK
+		        ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng);
+			return token (ACE_PATHNAME);
+		      }
+	ACE_YY_BREAK
 case 22:
 ACE_YY_RULE_SETUP
 #line 82 "Svc_Conf.l"
 ; /* EMPTY */
-        ACE_YY_BREAK
+	ACE_YY_BREAK
 case 23:
 ACE_YY_RULE_SETUP
 #line 83 "Svc_Conf.l"
 { ace_yylineno++; }
-        ACE_YY_BREAK
+	ACE_YY_BREAK
 case 24:
 ACE_YY_RULE_SETUP
 #line 84 "Svc_Conf.l"
-{ ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("unknown character = (%d"), *ace_yytext));
+{ ACE_ERROR ((LM_ERROR,
+                                ACE_LIB_TEXT ("unknown character = (%d"), 
+                                          *ace_yytext));
                         if (ACE_OS::ace_isprint (*ace_yytext))
                           ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("|%c"), *ace_yytext));
                         ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT (")\n")));
                       }
-        ACE_YY_BREAK
+	ACE_YY_BREAK
 case ACE_YY_STATE_EOF(INITIAL):
 case ACE_YY_STATE_EOF(PARAMETERS):
 case ACE_YY_STATE_EOF(NORMAL):
-#line 89 "Svc_Conf.l"
+#line 91 "Svc_Conf.l"
 { ACE_YY_NEW_FILE; ace_yyterminate(); }
-//      ACE_YY_BREAK
+	ACE_YY_BREAK
 case 25:
 ACE_YY_RULE_SETUP
-#line 90 "Svc_Conf.l"
+#line 92 "Svc_Conf.l"
 ACE_SVC_CONF_ECHO;
-        ACE_YY_BREAK
-
-        case ACE_YY_END_OF_BUFFER:
-                {
-                /* 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. */
-                *ace_yy_cp = ace_yy_hold_char;
-                ACE_YY_RESTORE_ACE_YY_MORE_OFFSET
-
-                if ( ace_yy_current_buffer->ace_yy_buffer_status == ACE_YY_BUFFER_NEW )
-                        {
-                        /* We're scanning a new file or input source.  It's
-                         * possible that this happened because the user
-                         * just pointed ace_yyin at a new source and called
-                         * ace_yylex().  If so, then we have to assure
-                         * consistency between ace_yy_current_buffer and our
-                         * globals.  Here is the right place to do so, because
-                         * this is the first action (other than possibly a
-                         * back-up) that will match for the new input source.
-                         */
-                        ace_yy_n_chars = ace_yy_current_buffer->ace_yy_n_chars;
-                        ace_yy_current_buffer->ace_yy_input_file = ace_yyin;
-                        ace_yy_current_buffer->ace_yy_buffer_status = ACE_YY_BUFFER_NORMAL;
-                        }
-
-                /* Note that here we test for ace_yy_c_buf_p "<=" to the position
-                 * of the first EOB in the buffer, since ace_yy_c_buf_p will
-                 * already have been incremented past the NUL character
-                 * (since all states make transitions on EOB to the
-                 * end-of-buffer state).  Contrast this with the test
-                 * in input().
-                 */
-                if ( ace_yy_c_buf_p <= &ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars] )
-                        { /* This was really a NUL. */
-                        ace_yy_state_type ace_yy_next_state;
-
-                        ace_yy_c_buf_p = ace_yytext_ptr + ace_yy_amount_of_matched_text;
-
-                        ace_yy_current_state = ace_yy_get_previous_state();
-
-                        /* Okay, we're now positioned to make the NUL
-                         * transition.  We couldn't have
-                         * ace_yy_get_previous_state() go ahead and do it
-                         * for us because it doesn't know how to deal
-                         * with the possibility of jamming (and we don't
-                         * want to build jamming into it because then it
-                         * will run more slowly).
-                         */
-
-                        ace_yy_next_state = ace_yy_try_NUL_trans( ace_yy_current_state );
-
-                        ace_yy_bp = ace_yytext_ptr + ACE_YY_MORE_ADJ;
-
-                        if ( ace_yy_next_state )
-                                {
-                                /* Consume the NUL. */
-                                ace_yy_cp = ++ace_yy_c_buf_p;
-                                ace_yy_current_state = ace_yy_next_state;
-                                goto ace_yy_match;
-                                }
-
-                        else
-                                {
-                                ace_yy_cp = ace_yy_c_buf_p;
-                                goto ace_yy_find_action;
-                                }
-                        }
-
-                else switch ( ace_yy_get_next_buffer() )
-                        {
-                        case EOB_ACT_END_OF_FILE:
-                                {
-                                ace_yy_did_buffer_switch_on_eof = 0;
-
-                                if ( ace_yywrap() )
-                                        {
-                                        /* Note: because we've taken care in
-                                         * ace_yy_get_next_buffer() to have set up
-                                         * ace_yytext, we can now set up
-                                         * ace_yy_c_buf_p so that if some total
-                                         * hoser (like flex itself) wants to
-                                         * call the scanner after we return the
-                                         * ACE_YY_NULL, it'll still work - another
-                                         * ACE_YY_NULL will get returned.
-                                         */
-                                        ace_yy_c_buf_p = ace_yytext_ptr + ACE_YY_MORE_ADJ;
-
-                                        ace_yy_act = ACE_YY_STATE_EOF(ACE_YY_START);
-                                        goto do_action;
-                                        }
-
-                                else
-                                        {
-                                        if ( ! ace_yy_did_buffer_switch_on_eof )
-                                                ACE_YY_NEW_FILE;
-                                        }
-                                break;
-                                }
-
-                        case EOB_ACT_CONTINUE_SCAN:
-                                ace_yy_c_buf_p =
-                                        ace_yytext_ptr + ace_yy_amount_of_matched_text;
-
-                                ace_yy_current_state = ace_yy_get_previous_state();
-
-                                ace_yy_cp = ace_yy_c_buf_p;
-                                ace_yy_bp = ace_yytext_ptr + ACE_YY_MORE_ADJ;
-                                goto ace_yy_match;
-
-                        case EOB_ACT_LAST_MATCH:
-                                ace_yy_c_buf_p =
-                                &ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars];
-
-                                ace_yy_current_state = ace_yy_get_previous_state();
-
-                                ace_yy_cp = ace_yy_c_buf_p;
-                                ace_yy_bp = ace_yytext_ptr + ACE_YY_MORE_ADJ;
-                                goto ace_yy_find_action;
-                        }
-                break;
-                }
-
-        default:
-                ACE_YY_FATAL_ERROR(
-                        ACE_LIB_TEXT ("fatal flex scanner internal error--no action found" ));
-        } /* end of action switch */
-                } /* end of scanning one token */
-        } /* end of ace_yylex */
+	ACE_YY_BREAK
+
+	case ACE_YY_END_OF_BUFFER:
+		{
+		/* Amount of text matched not including the EOB char. */
+		int ace_yy_amount_of_matched_text = (int) (ace_yy_cp - ace_yytext_ptr) - 1;
+
+		/* Undo the effects of ACE_YY_DO_BEFORE_ACTION. */
+		*ace_yy_cp = ace_yy_hold_char;
+		ACE_YY_RESTORE_ACE_YY_MORE_OFFSET
+
+		if ( ace_yy_current_buffer->ace_yy_buffer_status == ACE_YY_BUFFER_NEW )
+			{
+			/* We're scanning a new file or input source.  It's
+			 * possible that this happened because the user
+			 * just pointed ace_yyin at a new source and called
+			 * ace_yylex().  If so, then we have to assure
+			 * consistency between ace_yy_current_buffer and our
+			 * globals.  Here is the right place to do so, because
+			 * this is the first action (other than possibly a
+			 * back-up) that will match for the new input source.
+			 */
+			ace_yy_n_chars = ace_yy_current_buffer->ace_yy_n_chars;
+			ace_yy_current_buffer->ace_yy_input_file = ace_yyin;
+			ace_yy_current_buffer->ace_yy_buffer_status = ACE_YY_BUFFER_NORMAL;
+			}
+
+		/* Note that here we test for ace_yy_c_buf_p "<=" to the position
+		 * of the first EOB in the buffer, since ace_yy_c_buf_p will
+		 * already have been incremented past the NUL character
+		 * (since all states make transitions on EOB to the
+		 * end-of-buffer state).  Contrast this with the test
+		 * in input().
+		 */
+		if ( ace_yy_c_buf_p <= &ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars] )
+			{ /* This was really a NUL. */
+			ace_yy_state_type ace_yy_next_state;
+
+			ace_yy_c_buf_p = ace_yytext_ptr + ace_yy_amount_of_matched_text;
+
+			ace_yy_current_state = ace_yy_get_previous_state();
+
+			/* Okay, we're now positioned to make the NUL
+			 * transition.  We couldn't have
+			 * ace_yy_get_previous_state() go ahead and do it
+			 * for us because it doesn't know how to deal
+			 * with the possibility of jamming (and we don't
+			 * want to build jamming into it because then it
+			 * will run more slowly).
+			 */
+
+			ace_yy_next_state = ace_yy_try_NUL_trans( ace_yy_current_state );
+
+			ace_yy_bp = ace_yytext_ptr + ACE_YY_MORE_ADJ;
+
+			if ( ace_yy_next_state )
+				{
+				/* Consume the NUL. */
+				ace_yy_cp = ++ace_yy_c_buf_p;
+				ace_yy_current_state = ace_yy_next_state;
+				goto ace_yy_match;
+				}
+
+			else
+				{
+				ace_yy_cp = ace_yy_c_buf_p;
+				goto ace_yy_find_action;
+				}
+			}
+
+		else switch ( ace_yy_get_next_buffer() )
+			{
+			case EOB_ACT_END_OF_FILE:
+				{
+				ace_yy_did_buffer_switch_on_eof = 0;
+
+				if ( ace_yywrap() )
+					{
+					/* Note: because we've taken care in
+					 * ace_yy_get_next_buffer() to have set up
+					 * ace_yytext, we can now set up
+					 * ace_yy_c_buf_p so that if some total
+					 * hoser (like flex itself) wants to
+					 * call the scanner after we return the
+					 * ACE_YY_NULL, it'll still work - another
+					 * ACE_YY_NULL will get returned.
+					 */
+					ace_yy_c_buf_p = ace_yytext_ptr + ACE_YY_MORE_ADJ;
+
+					ace_yy_act = ACE_YY_STATE_EOF(ACE_YY_START);
+					goto do_action;
+					}
+
+				else
+					{
+					if ( ! ace_yy_did_buffer_switch_on_eof )
+						ACE_YY_NEW_FILE;
+					}
+				break;
+				}
+
+			case EOB_ACT_CONTINUE_SCAN:
+				ace_yy_c_buf_p =
+					ace_yytext_ptr + ace_yy_amount_of_matched_text;
+
+				ace_yy_current_state = ace_yy_get_previous_state();
+
+				ace_yy_cp = ace_yy_c_buf_p;
+				ace_yy_bp = ace_yytext_ptr + ACE_YY_MORE_ADJ;
+				goto ace_yy_match;
+
+			case EOB_ACT_LAST_MATCH:
+				ace_yy_c_buf_p =
+				&ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars];
+
+				ace_yy_current_state = ace_yy_get_previous_state();
+
+				ace_yy_cp = ace_yy_c_buf_p;
+				ace_yy_bp = ace_yytext_ptr + ACE_YY_MORE_ADJ;
+				goto ace_yy_find_action;
+			}
+		break;
+		}
+
+	default:
+		ACE_YY_FATAL_ERROR(
+			"fatal flex scanner internal error--no action found" );
+	} /* end of action switch */
+		} /* end of scanning one token */
+	} /* end of ace_yylex */
 
 
 /* ace_yy_get_next_buffer - try to read in a new buffer
  *
  * Returns a code representing an action:
- *      EOB_ACT_LAST_MATCH -
- *      EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *      EOB_ACT_END_OF_FILE - end of file
+ *	EOB_ACT_LAST_MATCH -
+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *	EOB_ACT_END_OF_FILE - end of file
  */
 
 static int ace_yy_get_next_buffer()
-        {
-        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(
-                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. */
-                if ( ace_yy_c_buf_p - ace_yytext_ptr - ACE_YY_MORE_ADJ == 1 )
-                        {
-                        /* We matched a single character, the EOB, so
-                         * treat this as a final EOF.
-                         */
-                        return EOB_ACT_END_OF_FILE;
-                        }
-
-                else
-                        {
-                        /* We matched some text prior to the EOB, first
-                         * process it.
-                         */
-                        return EOB_ACT_LAST_MATCH;
-                        }
-                }
-
-        /* Try to read more data. */
-
-        /* First move last chars to start of buffer. */
-        number_to_move = (int) (ace_yy_c_buf_p - ace_yytext_ptr) - 1;
-
-        for ( i = 0; i < number_to_move; ++i )
-                *(dest++) = *(source++);
-
-        if ( ace_yy_current_buffer->ace_yy_buffer_status == ACE_YY_BUFFER_EOF_PENDING )
-                /* don't do the read, it's not guaranteed to return an EOF,
-                 * just force an EOF
-                 */
-                ace_yy_current_buffer->ace_yy_n_chars = ace_yy_n_chars = 0;
-
-        else
-                {
-                int num_to_read =
-                        ace_yy_current_buffer->ace_yy_buf_size - number_to_move - 1;
-
-                while ( num_to_read <= 0 )
-                        { /* Not enough room in the buffer - grow it. */
+	{
+	register char *dest = ace_yy_current_buffer->ace_yy_ch_buf;
+	register char *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" );
+
+	if ( ace_yy_current_buffer->ace_yy_fill_buffer == 0 )
+		{ /* Don't try to fill the buffer, so this is an EOF. */
+		if ( ace_yy_c_buf_p - ace_yytext_ptr - ACE_YY_MORE_ADJ == 1 )
+			{
+			/* We matched a single character, the EOB, so
+			 * treat this as a final EOF.
+			 */
+			return EOB_ACT_END_OF_FILE;
+			}
+
+		else
+			{
+			/* We matched some text prior to the EOB, first
+			 * process it.
+			 */
+			return EOB_ACT_LAST_MATCH;
+			}
+		}
+
+	/* Try to read more data. */
+
+	/* First move last chars to start of buffer. */
+	number_to_move = (int) (ace_yy_c_buf_p - ace_yytext_ptr) - 1;
+
+	for ( i = 0; i < number_to_move; ++i )
+		*(dest++) = *(source++);
+
+	if ( ace_yy_current_buffer->ace_yy_buffer_status == ACE_YY_BUFFER_EOF_PENDING )
+		/* don't do the read, it's not guaranteed to return an EOF,
+		 * just force an EOF
+		 */
+		ace_yy_current_buffer->ace_yy_n_chars = ace_yy_n_chars = 0;
+
+	else
+		{
+		int num_to_read =
+			ace_yy_current_buffer->ace_yy_buf_size - number_to_move - 1;
+
+		while ( num_to_read <= 0 )
+			{ /* Not enough room in the buffer - grow it. */
 #ifdef ACE_YY_USES_REJECT
-                        ACE_YY_FATAL_ERROR(
+			ACE_YY_FATAL_ERROR(
 "input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
 #else
 
-                        /* just a shorter name for the current buffer */
-                        ACE_YY_BUFFER_STATE b = ace_yy_current_buffer;
+			/* just a shorter name for the current buffer */
+			ACE_YY_BUFFER_STATE b = ace_yy_current_buffer;
 
-                        int ace_yy_c_buf_p_offset =
-                                (int) (ace_yy_c_buf_p - b->ace_yy_ch_buf);
+			int ace_yy_c_buf_p_offset =
+				(int) (ace_yy_c_buf_p - b->ace_yy_ch_buf);
 
-                        if ( b->ace_yy_is_our_buffer )
-                                {
-                                int new_size = b->ace_yy_buf_size * 2;
+			if ( b->ace_yy_is_our_buffer )
+				{
+				int new_size = b->ace_yy_buf_size * 2;
 
-                                if ( new_size <= 0 )
-                                        b->ace_yy_buf_size += b->ace_yy_buf_size / 8;
-                                else
-                                        b->ace_yy_buf_size *= 2;
+				if ( new_size <= 0 )
+					b->ace_yy_buf_size += b->ace_yy_buf_size / 8;
+				else
+					b->ace_yy_buf_size *= 2;
 
-                                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 );
-                                }
-                        else
-                                /* Can't grow it, we don't own it. */
-                                b->ace_yy_ch_buf = 0;
+				b->ace_yy_ch_buf = (char *)
+					/* Include room in for 2 EOB chars. */
+					ace_yy_flex_realloc( (void *) b->ace_yy_ch_buf,
+							 b->ace_yy_buf_size + 2 );
+				}
+			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(
-                                ACE_LIB_TEXT ("fatal error - scanner input buffer overflow") );
+			if ( ! b->ace_yy_ch_buf )
+				ACE_YY_FATAL_ERROR(
+				"fatal error - scanner input buffer overflow" );
 
-                        ace_yy_c_buf_p = &b->ace_yy_ch_buf[ace_yy_c_buf_p_offset];
+			ace_yy_c_buf_p = &b->ace_yy_ch_buf[ace_yy_c_buf_p_offset];
 
-                        num_to_read = ace_yy_current_buffer->ace_yy_buf_size -
-                                                number_to_move - 1;
+			num_to_read = ace_yy_current_buffer->ace_yy_buf_size -
+						number_to_move - 1;
 #endif
-                        }
+			}
 
-                if ( num_to_read * sizeof (ACE_TCHAR) > ACE_YY_READ_BUF_SIZE )
-                        num_to_read = ACE_YY_READ_BUF_SIZE / sizeof (ACE_TCHAR);
+		if ( num_to_read > ACE_YY_READ_BUF_SIZE )
+			num_to_read = ACE_YY_READ_BUF_SIZE;
 
-                /* Read in more data. */
-                ACE_YY_INPUT( (&ace_yy_current_buffer->ace_yy_ch_buf[number_to_move]),
-                        ace_yy_n_chars, num_to_read );
+		/* Read in more data. */
+		ACE_YY_INPUT( (&ace_yy_current_buffer->ace_yy_ch_buf[number_to_move]),
+			ace_yy_n_chars, num_to_read );
 
-                ace_yy_current_buffer->ace_yy_n_chars = ace_yy_n_chars;
-                }
+		ace_yy_current_buffer->ace_yy_n_chars = ace_yy_n_chars;
+		}
 
-        if ( ace_yy_n_chars == 0 )
-                {
-                if ( number_to_move == ACE_YY_MORE_ADJ )
-                        {
-                        ret_val = EOB_ACT_END_OF_FILE;
-                        ace_yyrestart( ace_yyin );
-                        }
+	if ( ace_yy_n_chars == 0 )
+		{
+		if ( number_to_move == ACE_YY_MORE_ADJ )
+			{
+			ret_val = EOB_ACT_END_OF_FILE;
+			ace_yyrestart( ace_yyin );
+			}
 
-                else
-                        {
-                        ret_val = EOB_ACT_LAST_MATCH;
-                        ace_yy_current_buffer->ace_yy_buffer_status =
-                                ACE_YY_BUFFER_EOF_PENDING;
-                        }
-                }
+		else
+			{
+			ret_val = EOB_ACT_LAST_MATCH;
+			ace_yy_current_buffer->ace_yy_buffer_status =
+				ACE_YY_BUFFER_EOF_PENDING;
+			}
+		}
 
-        else
-                ret_val = EOB_ACT_CONTINUE_SCAN;
+	else
+		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-        ace_yy_n_chars += number_to_move;
-        ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars] = ACE_YY_END_OF_BUFFER_CHAR;
-        ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars + 1] = ACE_YY_END_OF_BUFFER_CHAR;
+	ace_yy_n_chars += number_to_move;
+	ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars] = ACE_YY_END_OF_BUFFER_CHAR;
+	ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars + 1] = ACE_YY_END_OF_BUFFER_CHAR;
 
-        ace_yytext_ptr = &ace_yy_current_buffer->ace_yy_ch_buf[0];
+	ace_yytext_ptr = &ace_yy_current_buffer->ace_yy_ch_buf[0];
 
-        return ret_val;
-        }
+	return ret_val;
+	}
 
 
-/* ace_yy_get_previous_state - get the state just before the EOB ACE_TCHAR was reached */
+/* ace_yy_get_previous_state - get the state just before the EOB char was reached */
 
 static ace_yy_state_type ace_yy_get_previous_state()
-        {
-        register ace_yy_state_type ace_yy_current_state;
-        register ACE_TCHAR *ace_yy_cp;
-
-        ace_yy_current_state = ace_yy_start;
-        ace_yy_current_state += ACE_YY_AT_BOL();
-
-        for ( ace_yy_cp = ace_yytext_ptr + ACE_YY_MORE_ADJ; ace_yy_cp < ace_yy_c_buf_p; ++ace_yy_cp )
-                {
-                register ACE_YY_CHAR ace_yy_c = (*ace_yy_cp ? ace_yy_ec[ACE_YY_SC_TO_UI(*ace_yy_cp)] : 1);
-                if ( ace_yy_accept[ace_yy_current_state] )
-                        {
-                        ace_yy_last_accepting_state = ace_yy_current_state;
-                        ace_yy_last_accepting_cpos = ace_yy_cp;
-                        }
-                while ( ace_yy_chk[ace_yy_base[ace_yy_current_state] + ace_yy_c] != ace_yy_current_state )
-                        {
-                        ace_yy_current_state = (int) ace_yy_def[ace_yy_current_state];
-                        if ( ace_yy_current_state >= 107 )
-                                ace_yy_c = ace_yy_meta[(unsigned int) ace_yy_c];
-                        }
-                ace_yy_current_state = ace_yy_nxt[ace_yy_base[ace_yy_current_state] + (unsigned int) ace_yy_c];
-                }
-
-        return ace_yy_current_state;
-        }
+	{
+	register ace_yy_state_type ace_yy_current_state;
+	register char *ace_yy_cp;
+
+	ace_yy_current_state = ace_yy_start;
+	ace_yy_current_state += ACE_YY_AT_BOL();
+
+	for ( ace_yy_cp = ace_yytext_ptr + ACE_YY_MORE_ADJ; ace_yy_cp < ace_yy_c_buf_p; ++ace_yy_cp )
+		{
+		register ACE_YY_CHAR ace_yy_c = (*ace_yy_cp ? ace_yy_ec[ACE_YY_SC_TO_UI(*ace_yy_cp)] : 1);
+		if ( ace_yy_accept[ace_yy_current_state] )
+			{
+			ace_yy_last_accepting_state = ace_yy_current_state;
+			ace_yy_last_accepting_cpos = ace_yy_cp;
+			}
+		while ( ace_yy_chk[ace_yy_base[ace_yy_current_state] + ace_yy_c] != ace_yy_current_state )
+			{
+			ace_yy_current_state = (int) ace_yy_def[ace_yy_current_state];
+			if ( ace_yy_current_state >= 107 )
+				ace_yy_c = ace_yy_meta[(unsigned int) ace_yy_c];
+			}
+		ace_yy_current_state = ace_yy_nxt[ace_yy_base[ace_yy_current_state] + (unsigned int) ace_yy_c];
+		}
+
+	return ace_yy_current_state;
+	}
 
 
 /* ace_yy_try_NUL_trans - try to make a transition on the NUL character
  *
  * synopsis
- *      next_state = ace_yy_try_NUL_trans( current_state );
+ *	next_state = ace_yy_try_NUL_trans( current_state );
  */
 
 #ifdef ACE_YY_USE_PROTOS
@@ -1240,72 +1239,72 @@ static ace_yy_state_type ace_yy_try_NUL_trans( ace_yy_state_type ace_yy_current_
 static ace_yy_state_type ace_yy_try_NUL_trans( ace_yy_current_state )
 ace_yy_state_type ace_yy_current_state;
 #endif
-        {
-        register int ace_yy_is_jam;
-        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] )
-                {
-                ace_yy_last_accepting_state = ace_yy_current_state;
-                ace_yy_last_accepting_cpos = ace_yy_cp;
-                }
-        while ( ace_yy_chk[ace_yy_base[ace_yy_current_state] + ace_yy_c] != ace_yy_current_state )
-                {
-                ace_yy_current_state = (int) ace_yy_def[ace_yy_current_state];
-                if ( ace_yy_current_state >= 107 )
-                        ace_yy_c = ace_yy_meta[(unsigned int) ace_yy_c];
-                }
-        ace_yy_current_state = ace_yy_nxt[ace_yy_base[ace_yy_current_state] + (unsigned int) ace_yy_c];
-        ace_yy_is_jam = (ace_yy_current_state == 106);
-
-        return ace_yy_is_jam ? 0 : ace_yy_current_state;
-        }
+	{
+	register int ace_yy_is_jam;
+	register char *ace_yy_cp = ace_yy_c_buf_p;
+
+	register ACE_YY_CHAR ace_yy_c = 1;
+	if ( ace_yy_accept[ace_yy_current_state] )
+		{
+		ace_yy_last_accepting_state = ace_yy_current_state;
+		ace_yy_last_accepting_cpos = ace_yy_cp;
+		}
+	while ( ace_yy_chk[ace_yy_base[ace_yy_current_state] + ace_yy_c] != ace_yy_current_state )
+		{
+		ace_yy_current_state = (int) ace_yy_def[ace_yy_current_state];
+		if ( ace_yy_current_state >= 107 )
+			ace_yy_c = ace_yy_meta[(unsigned int) ace_yy_c];
+		}
+	ace_yy_current_state = ace_yy_nxt[ace_yy_base[ace_yy_current_state] + (unsigned int) ace_yy_c];
+	ace_yy_is_jam = (ace_yy_current_state == 106);
+
+	return ace_yy_is_jam ? 0 : ace_yy_current_state;
+	}
 
 
 #ifndef ACE_YY_NO_UNPUT
 #ifdef ACE_YY_USE_PROTOS
-static void ace_yyunput( int c, register ACE_TCHAR *ace_yy_bp )
+static void ace_yyunput( int c, register char *ace_yy_bp )
 #else
 static void ace_yyunput( c, ace_yy_bp )
 int c;
-register ACE_TCHAR *ace_yy_bp;
+register char *ace_yy_bp;
 #endif
-        {
-        register ACE_TCHAR *ace_yy_cp = ace_yy_c_buf_p;
+	{
+	register char *ace_yy_cp = ace_yy_c_buf_p;
 
-        /* undo effects of setting up ace_yytext */
-        *ace_yy_cp = ace_yy_hold_char;
+	/* undo effects of setting up ace_yytext */
+	*ace_yy_cp = ace_yy_hold_char;
 
-        if ( ace_yy_cp < ace_yy_current_buffer->ace_yy_ch_buf + 2 )
-                { /* need to shift things up to make room */
-                /* +2 for EOB chars. */
-                register int number_to_move = ace_yy_n_chars + 2;
-                register ACE_TCHAR *dest = &ace_yy_current_buffer->ace_yy_ch_buf[
-                                        ace_yy_current_buffer->ace_yy_buf_size + 2];
-                register ACE_TCHAR *source =
-                                &ace_yy_current_buffer->ace_yy_ch_buf[number_to_move];
+	if ( ace_yy_cp < ace_yy_current_buffer->ace_yy_ch_buf + 2 )
+		{ /* 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[
+					ace_yy_current_buffer->ace_yy_buf_size + 2];
+		register char *source =
+				&ace_yy_current_buffer->ace_yy_ch_buf[number_to_move];
 
-                while ( source > ace_yy_current_buffer->ace_yy_ch_buf )
-                        *--dest = *--source;
+		while ( source > ace_yy_current_buffer->ace_yy_ch_buf )
+			*--dest = *--source;
 
-                ace_yy_cp += (int) (dest - source);
-                ace_yy_bp += (int) (dest - source);
-                ace_yy_current_buffer->ace_yy_n_chars =
-                        ace_yy_n_chars = ace_yy_current_buffer->ace_yy_buf_size;
+		ace_yy_cp += (int) (dest - source);
+		ace_yy_bp += (int) (dest - source);
+		ace_yy_current_buffer->ace_yy_n_chars =
+			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" );
-                }
+		if ( ace_yy_cp < ace_yy_current_buffer->ace_yy_ch_buf + 2 )
+			ACE_YY_FATAL_ERROR( "flex scanner push-back overflow" );
+		}
 
-        *--ace_yy_cp = (ACE_TCHAR) c;
+	*--ace_yy_cp = (char) c;
 
 
-        ace_yytext_ptr = ace_yy_bp;
-        ace_yy_hold_char = *ace_yy_cp;
-        ace_yy_c_buf_p = ace_yy_cp;
-        }
-#endif  /* ifndef ACE_YY_NO_UNPUT */
+	ace_yytext_ptr = ace_yy_bp;
+	ace_yy_hold_char = *ace_yy_cp;
+	ace_yy_c_buf_p = ace_yy_cp;
+	}
+#endif	/* ifndef ACE_YY_NO_UNPUT */
 
 
 #ifdef __cplusplus
@@ -1313,73 +1312,73 @@ static int ace_yyinput()
 #else
 static int input()
 #endif
-        {
-        int c;
-
-        *ace_yy_c_buf_p = ace_yy_hold_char;
-
-        if ( *ace_yy_c_buf_p == ACE_YY_END_OF_BUFFER_CHAR )
-                {
-                /* ace_yy_c_buf_p now points to the character we want to return.
-                 * If this occurs *before* the EOB characters, then it's a
-                 * valid NUL; if not, then we've hit the end of the buffer.
-                 */
-                if ( ace_yy_c_buf_p < &ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars] )
-                        /* This was really a NUL. */
-                        *ace_yy_c_buf_p = '\0';
-
-                else
-                        { /* need more input */
-                        int offset = ace_yy_c_buf_p - ace_yytext_ptr;
-                        ++ace_yy_c_buf_p;
-
-                        switch ( ace_yy_get_next_buffer() )
-                                {
-                                case EOB_ACT_LAST_MATCH:
-                                        /* This happens because ace_yy_g_n_b()
-                                         * sees that we've accumulated a
-                                         * token and flags that we need to
-                                         * try matching the token before
-                                         * proceeding.  But for input(),
-                                         * there's no matching to consider.
-                                         * So convert the EOB_ACT_LAST_MATCH
-                                         * to EOB_ACT_END_OF_FILE.
-                                         */
-
-                                        /* Reset buffer status. */
-                                        ace_yyrestart( ace_yyin );
-
-                                        /* fall through */
-
-                                case EOB_ACT_END_OF_FILE:
-                                        {
-                                        if ( ace_yywrap() )
-                                                return EOF;
-
-                                        if ( ! ace_yy_did_buffer_switch_on_eof )
-                                                ACE_YY_NEW_FILE;
+	{
+	int c;
+
+	*ace_yy_c_buf_p = ace_yy_hold_char;
+
+	if ( *ace_yy_c_buf_p == ACE_YY_END_OF_BUFFER_CHAR )
+		{
+		/* ace_yy_c_buf_p now points to the character we want to return.
+		 * If this occurs *before* the EOB characters, then it's a
+		 * valid NUL; if not, then we've hit the end of the buffer.
+		 */
+		if ( ace_yy_c_buf_p < &ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars] )
+			/* This was really a NUL. */
+			*ace_yy_c_buf_p = '\0';
+
+		else
+			{ /* need more input */
+			int offset = ace_yy_c_buf_p - ace_yytext_ptr;
+			++ace_yy_c_buf_p;
+
+			switch ( ace_yy_get_next_buffer() )
+				{
+				case EOB_ACT_LAST_MATCH:
+					/* This happens because ace_yy_g_n_b()
+					 * sees that we've accumulated a
+					 * token and flags that we need to
+					 * try matching the token before
+					 * proceeding.  But for input(),
+					 * there's no matching to consider.
+					 * So convert the EOB_ACT_LAST_MATCH
+					 * to EOB_ACT_END_OF_FILE.
+					 */
+
+					/* Reset buffer status. */
+					ace_yyrestart( ace_yyin );
+
+					/* fall through */
+
+				case EOB_ACT_END_OF_FILE:
+					{
+					if ( ace_yywrap() )
+						return EOF;
+
+					if ( ! ace_yy_did_buffer_switch_on_eof )
+						ACE_YY_NEW_FILE;
 #ifdef __cplusplus
-                                        return ace_yyinput();
+					return ace_yyinput();
 #else
-                                        return input();
+					return input();
 #endif
-                                        }
+					}
 
-                                case EOB_ACT_CONTINUE_SCAN:
-                                        ace_yy_c_buf_p = ace_yytext_ptr + offset;
-                                        break;
-                                }
-                        }
-                }
+				case EOB_ACT_CONTINUE_SCAN:
+					ace_yy_c_buf_p = ace_yytext_ptr + offset;
+					break;
+				}
+			}
+		}
 
-        c = *(unsigned char *) ace_yy_c_buf_p;  /* cast for 8-bit char's */
-        *ace_yy_c_buf_p = '\0'; /* preserve ace_yytext */
-        ace_yy_hold_char = *++ace_yy_c_buf_p;
+	c = *(unsigned char *) ace_yy_c_buf_p;	/* cast for 8-bit char's */
+	*ace_yy_c_buf_p = '\0';	/* preserve ace_yytext */
+	ace_yy_hold_char = *++ace_yy_c_buf_p;
 
-        ace_yy_current_buffer->ace_yy_at_bol = (c == '\n');
+	ace_yy_current_buffer->ace_yy_at_bol = (c == '\n');
 
-        return c;
-        }
+	return c;
+	}
 
 
 #ifdef ACE_YY_USE_PROTOS
@@ -1388,13 +1387,13 @@ void ace_yyrestart( FILE *input_file )
 void ace_yyrestart( input_file )
 FILE *input_file;
 #endif
-        {
-        if ( ! ace_yy_current_buffer )
-                ace_yy_current_buffer = ace_yy_create_buffer( ace_yyin, ACE_YY_BUF_SIZE );
+	{
+	if ( ! ace_yy_current_buffer )
+		ace_yy_current_buffer = ace_yy_create_buffer( ace_yyin, ACE_YY_BUF_SIZE );
 
-        ace_yy_init_buffer( ace_yy_current_buffer, input_file );
-        ace_yy_load_buffer_state();
-        }
+	ace_yy_init_buffer( ace_yy_current_buffer, input_file );
+	ace_yy_load_buffer_state();
+	}
 
 
 #ifdef ACE_YY_USE_PROTOS
@@ -1403,28 +1402,28 @@ void ace_yy_switch_to_buffer( ACE_YY_BUFFER_STATE new_buffer )
 void ace_yy_switch_to_buffer( new_buffer )
 ACE_YY_BUFFER_STATE new_buffer;
 #endif
-        {
-        if ( ace_yy_current_buffer == new_buffer )
-                return;
+	{
+	if ( ace_yy_current_buffer == new_buffer )
+		return;
 
-        if ( ace_yy_current_buffer )
-                {
-                /* Flush out information for old buffer. */
-                *ace_yy_c_buf_p = ace_yy_hold_char;
-                ace_yy_current_buffer->ace_yy_buf_pos = ace_yy_c_buf_p;
-                ace_yy_current_buffer->ace_yy_n_chars = ace_yy_n_chars;
-                }
+	if ( ace_yy_current_buffer )
+		{
+		/* Flush out information for old buffer. */
+		*ace_yy_c_buf_p = ace_yy_hold_char;
+		ace_yy_current_buffer->ace_yy_buf_pos = ace_yy_c_buf_p;
+		ace_yy_current_buffer->ace_yy_n_chars = ace_yy_n_chars;
+		}
 
-        ace_yy_current_buffer = new_buffer;
-        ace_yy_load_buffer_state();
+	ace_yy_current_buffer = new_buffer;
+	ace_yy_load_buffer_state();
 
-        /* We don't actually know whether we did this switch during
-         * EOF (ace_yywrap()) processing, but the only time this flag
-         * is looked at is after ace_yywrap() is called, so it's safe
-         * to go ahead and always set it.
-         */
-        ace_yy_did_buffer_switch_on_eof = 1;
-        }
+	/* We don't actually know whether we did this switch during
+	 * EOF (ace_yywrap()) processing, but the only time this flag
+	 * is looked at is after ace_yywrap() is called, so it's safe
+	 * to go ahead and always set it.
+	 */
+	ace_yy_did_buffer_switch_on_eof = 1;
+	}
 
 
 #ifdef ACE_YY_USE_PROTOS
@@ -1432,12 +1431,12 @@ void ace_yy_load_buffer_state( void )
 #else
 void ace_yy_load_buffer_state()
 #endif
-        {
-        ace_yy_n_chars = ace_yy_current_buffer->ace_yy_n_chars;
-        ace_yytext_ptr = ace_yy_c_buf_p = ace_yy_current_buffer->ace_yy_buf_pos;
-        ace_yyin = ace_yy_current_buffer->ace_yy_input_file;
-        ace_yy_hold_char = *ace_yy_c_buf_p;
-        }
+	{
+	ace_yy_n_chars = ace_yy_current_buffer->ace_yy_n_chars;
+	ace_yytext_ptr = ace_yy_c_buf_p = ace_yy_current_buffer->ace_yy_buf_pos;
+	ace_yyin = ace_yy_current_buffer->ace_yy_input_file;
+	ace_yy_hold_char = *ace_yy_c_buf_p;
+	}
 
 
 #ifdef ACE_YY_USE_PROTOS
@@ -1447,28 +1446,28 @@ ACE_YY_BUFFER_STATE ace_yy_create_buffer( file, size )
 FILE *file;
 int size;
 #endif
-        {
-        ACE_YY_BUFFER_STATE b;
+	{
+	ACE_YY_BUFFER_STATE b;
 
-        b = (ACE_YY_BUFFER_STATE) ace_yy_flex_alloc( sizeof( struct ace_yy_buffer_state ) );
-        if ( ! b )
-                ACE_YY_FATAL_ERROR( ACE_LIB_TEXT ("out of dynamic memory in ace_yy_create_buffer()") );
+	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()" );
 
-        b->ace_yy_buf_size = size;
+	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 = (ACE_TCHAR *) ace_yy_flex_alloc( b->ace_yy_buf_size + 2 );
-        if ( ! b->ace_yy_ch_buf )
-                ACE_YY_FATAL_ERROR( ACE_LIB_TEXT ("out of dynamic memory in ace_yy_create_buffer()") );
+	/* 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 );
+	if ( ! b->ace_yy_ch_buf )
+		ACE_YY_FATAL_ERROR( "out of dynamic memory in ace_yy_create_buffer()" );
 
-        b->ace_yy_is_our_buffer = 1;
+	b->ace_yy_is_our_buffer = 1;
 
-        ace_yy_init_buffer( b, file );
+	ace_yy_init_buffer( b, file );
 
-        return b;
-        }
+	return b;
+	}
 
 
 #ifdef ACE_YY_USE_PROTOS
@@ -1477,18 +1476,18 @@ void ace_yy_delete_buffer( ACE_YY_BUFFER_STATE b )
 void ace_yy_delete_buffer( b )
 ACE_YY_BUFFER_STATE b;
 #endif
-        {
-        if ( ! b )
-                return;
+	{
+	if ( ! b )
+		return;
 
-        if ( b == ace_yy_current_buffer )
-                ace_yy_current_buffer = (ACE_YY_BUFFER_STATE) 0;
+	if ( b == ace_yy_current_buffer )
+		ace_yy_current_buffer = (ACE_YY_BUFFER_STATE) 0;
 
-        if ( b->ace_yy_is_our_buffer )
-                ace_yy_flex_free( (void *) b->ace_yy_ch_buf );
+	if ( b->ace_yy_is_our_buffer )
+		ace_yy_flex_free( (void *) b->ace_yy_ch_buf );
 
-        ace_yy_flex_free( (void *) b );
-        }
+	ace_yy_flex_free( (void *) b );
+	}
 
 
 #ifndef ACE_YY_ALWAYS_INTERACTIVE
@@ -1506,22 +1505,22 @@ FILE *file;
 #endif
 
 
-        {
-        ace_yy_flush_buffer( b );
+	{
+	ace_yy_flush_buffer( b );
 
-        b->ace_yy_input_file = file;
-        b->ace_yy_fill_buffer = 1;
+	b->ace_yy_input_file = file;
+	b->ace_yy_fill_buffer = 1;
 
 #if ACE_YY_ALWAYS_INTERACTIVE
-        b->ace_yy_is_interactive = 1;
+	b->ace_yy_is_interactive = 1;
 #else
 #if ACE_YY_NEVER_INTERACTIVE
-        b->ace_yy_is_interactive = 0;
+	b->ace_yy_is_interactive = 0;
 #else
-        b->ace_yy_is_interactive = file ? (ACE_OS::isatty( fileno (file) ) > 0) : 0;
+	b->ace_yy_is_interactive = file ? (ACE_OS::isatty( fileno (file) ) > 0) : 0;
 #endif
 #endif
-        }
+	}
 
 
 #ifdef ACE_YY_USE_PROTOS
@@ -1531,120 +1530,120 @@ void ace_yy_flush_buffer( b )
 ACE_YY_BUFFER_STATE b;
 #endif
 
-        {
-        if ( ! b )
-                return;
+	{
+	if ( ! b )
+		return;
 
-        b->ace_yy_n_chars = 0;
+	b->ace_yy_n_chars = 0;
 
-        /* We always need two end-of-buffer characters.  The first causes
-         * a transition to the end-of-buffer state.  The second causes
-         * a jam in that state.
-         */
-        b->ace_yy_ch_buf[0] = ACE_YY_END_OF_BUFFER_CHAR;
-        b->ace_yy_ch_buf[1] = ACE_YY_END_OF_BUFFER_CHAR;
+	/* We always need two end-of-buffer characters.  The first causes
+	 * a transition to the end-of-buffer state.  The second causes
+	 * a jam in that state.
+	 */
+	b->ace_yy_ch_buf[0] = ACE_YY_END_OF_BUFFER_CHAR;
+	b->ace_yy_ch_buf[1] = ACE_YY_END_OF_BUFFER_CHAR;
 
-        b->ace_yy_buf_pos = &b->ace_yy_ch_buf[0];
+	b->ace_yy_buf_pos = &b->ace_yy_ch_buf[0];
 
-        b->ace_yy_at_bol = 1;
-        b->ace_yy_buffer_status = ACE_YY_BUFFER_NEW;
+	b->ace_yy_at_bol = 1;
+	b->ace_yy_buffer_status = ACE_YY_BUFFER_NEW;
 
-        if ( b == ace_yy_current_buffer )
-                ace_yy_load_buffer_state();
-        }
+	if ( b == ace_yy_current_buffer )
+		ace_yy_load_buffer_state();
+	}
 
 
 #ifndef ACE_YY_NO_SCAN_BUFFER
 #ifdef ACE_YY_USE_PROTOS
-ACE_YY_BUFFER_STATE ace_yy_scan_buffer( ACE_TCHAR *base, ace_yy_size_t size )
+ACE_YY_BUFFER_STATE ace_yy_scan_buffer( char *base, ace_yy_size_t size )
 #else
 ACE_YY_BUFFER_STATE ace_yy_scan_buffer( base, size )
-ACE_TCHAR *base;
+char *base;
 ace_yy_size_t size;
 #endif
-        {
-        ACE_YY_BUFFER_STATE b;
+	{
+	ACE_YY_BUFFER_STATE b;
 
-        if ( size < 2 ||
-             base[size-2] != ACE_YY_END_OF_BUFFER_CHAR ||
-             base[size-1] != ACE_YY_END_OF_BUFFER_CHAR )
-                /* They forgot to leave room for the EOB's. */
-                return 0;
+	if ( size < 2 ||
+	     base[size-2] != ACE_YY_END_OF_BUFFER_CHAR ||
+	     base[size-1] != ACE_YY_END_OF_BUFFER_CHAR )
+		/* They forgot to leave room for the EOB's. */
+		return 0;
 
-        b = (ACE_YY_BUFFER_STATE) ace_yy_flex_alloc( sizeof( struct ace_yy_buffer_state ) );
-        if ( ! b )
-                ACE_YY_FATAL_ERROR( ACE_LIB_TEXT ("out of dynamic memory in ace_yy_scan_buffer()") );
+	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()" );
 
-        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;
-        b->ace_yy_is_our_buffer = 0;
-        b->ace_yy_input_file = 0;
-        b->ace_yy_n_chars = b->ace_yy_buf_size;
-        b->ace_yy_is_interactive = 0;
-        b->ace_yy_at_bol = 1;
-        b->ace_yy_fill_buffer = 0;
-        b->ace_yy_buffer_status = ACE_YY_BUFFER_NEW;
+	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;
+	b->ace_yy_is_our_buffer = 0;
+	b->ace_yy_input_file = 0;
+	b->ace_yy_n_chars = b->ace_yy_buf_size;
+	b->ace_yy_is_interactive = 0;
+	b->ace_yy_at_bol = 1;
+	b->ace_yy_fill_buffer = 0;
+	b->ace_yy_buffer_status = ACE_YY_BUFFER_NEW;
 
-        ace_yy_switch_to_buffer( b );
+	ace_yy_switch_to_buffer( b );
 
-        return b;
-        }
+	return b;
+	}
 #endif
 
 
 #ifndef ACE_YY_NO_SCAN_STRING
 #ifdef ACE_YY_USE_PROTOS
-ACE_YY_BUFFER_STATE ace_yy_scan_string( ace_yyconst ACE_TCHAR *ace_yy_str )
+ACE_YY_BUFFER_STATE ace_yy_scan_string( ace_yyconst char *ace_yy_str )
 #else
 ACE_YY_BUFFER_STATE ace_yy_scan_string( ace_yy_str )
-ace_yyconst ACE_TCHAR *ace_yy_str;
+ace_yyconst char *ace_yy_str;
 #endif
-        {
-        int len;
-        for ( len = 0; ace_yy_str[len]; ++len )
-                ;
+	{
+	int len;
+	for ( len = 0; ace_yy_str[len]; ++len )
+		;
 
-        return ace_yy_scan_bytes( ace_yy_str, len );
-        }
+	return ace_yy_scan_bytes( ace_yy_str, len );
+	}
 #endif
 
 
 #ifndef ACE_YY_NO_SCAN_BYTES
 #ifdef ACE_YY_USE_PROTOS
-ACE_YY_BUFFER_STATE ace_yy_scan_bytes( ace_yyconst ACE_TCHAR *bytes, int len )
+ACE_YY_BUFFER_STATE ace_yy_scan_bytes( ace_yyconst char *bytes, int len )
 #else
 ACE_YY_BUFFER_STATE ace_yy_scan_bytes( bytes, len )
-ace_yyconst ACE_TCHAR *bytes;
+ace_yyconst char *bytes;
 int len;
 #endif
-        {
-        ACE_YY_BUFFER_STATE b;
-        ACE_TCHAR *buf;
-        ace_yy_size_t n;
-        int i;
+	{
+	ACE_YY_BUFFER_STATE b;
+	char *buf;
+	ace_yy_size_t n;
+	int i;
 
-        /* Get memory for full buffer, including space for trailing EOB's. */
-        n = len + 2;
-        buf = (ACE_TCHAR *) ace_yy_flex_alloc( n );
-        if ( ! buf )
-                ACE_YY_FATAL_ERROR( ACE_LIB_TEXT ("out of dynamic memory in ace_yy_scan_bytes()") );
+	/* Get memory for full buffer, including space for trailing EOB's. */
+	n = len + 2;
+	buf = (char *) ace_yy_flex_alloc( n );
+	if ( ! buf )
+		ACE_YY_FATAL_ERROR( "out of dynamic memory in ace_yy_scan_bytes()" );
 
-        for ( i = 0; i < len; ++i )
-                buf[i] = bytes[i];
+	for ( i = 0; i < len; ++i )
+		buf[i] = bytes[i];
 
-        buf[len] = buf[len+1] = ACE_YY_END_OF_BUFFER_CHAR;
+	buf[len] = buf[len+1] = ACE_YY_END_OF_BUFFER_CHAR;
 
-        b = ace_yy_scan_buffer( buf, n );
-        if ( ! b )
-                ACE_YY_FATAL_ERROR( ACE_LIB_TEXT ("bad buffer in ace_yy_scan_bytes()") );
+	b = ace_yy_scan_buffer( buf, n );
+	if ( ! b )
+		ACE_YY_FATAL_ERROR( "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.
-         */
-        b->ace_yy_is_our_buffer = 1;
+	/* It's okay to grow etc. this buffer, and we should throw it
+	 * away when we're done.
+	 */
+	b->ace_yy_is_our_buffer = 1;
 
-        return b;
-        }
+	return b;
+	}
 #endif
 
 
@@ -1655,49 +1654,49 @@ static void ace_yy_push_state( int new_state )
 static void ace_yy_push_state( new_state )
 int new_state;
 #endif
-        {
-        if ( ace_yy_start_stack_ptr >= ace_yy_start_stack_depth )
-                {
-                ace_yy_size_t new_size;
+	{
+	if ( ace_yy_start_stack_ptr >= ace_yy_start_stack_depth )
+		{
+		ace_yy_size_t new_size;
 
-                ace_yy_start_stack_depth += ACE_YY_START_STACK_INCR;
-                new_size = ace_yy_start_stack_depth * sizeof( int );
+		ace_yy_start_stack_depth += ACE_YY_START_STACK_INCR;
+		new_size = ace_yy_start_stack_depth * sizeof( int );
 
-                if ( ! ace_yy_start_stack )
-                        ace_yy_start_stack = (int *) ace_yy_flex_alloc( new_size );
+		if ( ! ace_yy_start_stack )
+			ace_yy_start_stack = (int *) ace_yy_flex_alloc( new_size );
 
-                else
-                        ace_yy_start_stack = (int *) ace_yy_flex_realloc(
-                                        (void *) ace_yy_start_stack, new_size );
+		else
+			ace_yy_start_stack = (int *) ace_yy_flex_realloc(
+					(void *) ace_yy_start_stack, new_size );
 
-                if ( ! ace_yy_start_stack )
-                        ACE_YY_FATAL_ERROR(
-                        ACE_LIB_TEXT ("out of memory expanding start-condition stack") );
-                }
+		if ( ! ace_yy_start_stack )
+			ACE_YY_FATAL_ERROR(
+			"out of memory expanding start-condition stack" );
+		}
 
-        ace_yy_start_stack[ace_yy_start_stack_ptr++] = ACE_YY_START;
+	ace_yy_start_stack[ace_yy_start_stack_ptr++] = ACE_YY_START;
 
-        BEGIN(new_state);
-        }
+	BEGIN(new_state);
+	}
 #endif
 
 
 #ifndef ACE_YY_NO_POP_STATE
 static void ace_yy_pop_state()
-        {
-        if ( --ace_yy_start_stack_ptr < 0 )
-                ACE_YY_FATAL_ERROR( ACE_LIB_TEXT ("start-condition stack underflow") );
+	{
+	if ( --ace_yy_start_stack_ptr < 0 )
+		ACE_YY_FATAL_ERROR( "start-condition stack underflow" );
 
-        BEGIN(ace_yy_start_stack[ace_yy_start_stack_ptr]);
-        }
+	BEGIN(ace_yy_start_stack[ace_yy_start_stack_ptr]);
+	}
 #endif
 
 
 #ifndef ACE_YY_NO_TOP_STATE
 static int ace_yy_top_state()
-        {
-        return ace_yy_start_stack[ace_yy_start_stack_ptr - 1];
-        }
+	{
+	return ace_yy_start_stack[ace_yy_start_stack_ptr - 1];
+	}
 #endif
 
 #ifndef ACE_YY_EXIT_FAILURE
@@ -1705,15 +1704,15 @@ static int ace_yy_top_state()
 #endif
 
 #ifdef ACE_YY_USE_PROTOS
-static void ace_yy_fatal_error( ace_yyconst ACE_TCHAR msg[] )
+static void ace_yy_fatal_error( ace_yyconst char msg[] )
 #else
 static void ace_yy_fatal_error( msg )
-ACE_TCHAR msg[];
+char msg[];
 #endif
-        {
-        (void) fprintf( stderr, "%s\n", msg );
-        exit( ACE_YY_EXIT_FAILURE );
-        }
+	{
+	(void) fprintf( stderr, "%s\n", msg );
+	exit( ACE_YY_EXIT_FAILURE );
+	}
 
 
 
@@ -1721,50 +1720,50 @@ ACE_TCHAR msg[];
 
 #undef ace_yyless
 #define ace_yyless(n) \
-        do \
-                { \
-                /* Undo effects of setting up ace_yytext. */ \
-                ace_yytext[ace_yyleng] = ace_yy_hold_char; \
-                ace_yy_c_buf_p = ace_yytext + n; \
-                ace_yy_hold_char = *ace_yy_c_buf_p; \
-                *ace_yy_c_buf_p = '\0'; \
-                ace_yyleng = n; \
-                } \
-        while ( 0 )
+	do \
+		{ \
+		/* Undo effects of setting up ace_yytext. */ \
+		ace_yytext[ace_yyleng] = ace_yy_hold_char; \
+		ace_yy_c_buf_p = ace_yytext + n; \
+		ace_yy_hold_char = *ace_yy_c_buf_p; \
+		*ace_yy_c_buf_p = '\0'; \
+		ace_yyleng = n; \
+		} \
+	while ( 0 )
 
 
 /* Internal utility routines. */
 
 #ifndef ace_yytext_ptr
 #ifdef ACE_YY_USE_PROTOS
-static void ace_yy_flex_strncpy( ACE_TCHAR *s1, ace_yyconst ACE_TCHAR *s2, int n )
+static void ace_yy_flex_strncpy( char *s1, ace_yyconst char *s2, int n )
 #else
 static void ace_yy_flex_strncpy( s1, s2, n )
-ACE_TCHAR *s1;
-ace_yyconst ACE_TCHAR *s2;
+char *s1;
+ace_yyconst char *s2;
 int n;
 #endif
-        {
-        register int i;
-        for ( i = 0; i < n; ++i )
-                s1[i] = s2[i];
-        }
+	{
+	register int i;
+	for ( i = 0; i < n; ++i )
+		s1[i] = s2[i];
+	}
 #endif
 
 #ifdef ACE_YY_NEED_STRLEN
 #ifdef ACE_YY_USE_PROTOS
-static int ace_yy_flex_strlen( ace_yyconst ACE_TCHAR *s )
+static int ace_yy_flex_strlen( ace_yyconst char *s )
 #else
 static int ace_yy_flex_strlen( s )
-ace_yyconst ACE_TCHAR *s;
+ace_yyconst char *s;
 #endif
-        {
-        register int n;
-        for ( n = 0; s[n]; ++n )
-                ;
+	{
+	register int n;
+	for ( n = 0; s[n]; ++n )
+		;
 
-        return n;
-        }
+	return n;
+	}
 #endif
 
 
@@ -1774,9 +1773,9 @@ static void *ace_yy_flex_alloc( ace_yy_size_t size )
 static void *ace_yy_flex_alloc( size )
 ace_yy_size_t size;
 #endif
-        {
-        return (void *) malloc( size );
-        }
+	{
+	return (void *) malloc( size );
+	}
 
 #ifdef ACE_YY_USE_PROTOS
 static void *ace_yy_flex_realloc( void *ptr, ace_yy_size_t size )
@@ -1785,16 +1784,16 @@ static void *ace_yy_flex_realloc( ptr, size )
 void *ptr;
 ace_yy_size_t size;
 #endif
-        {
-        /* The cast to (ACE_TCHAR *) in the following accommodates both
-         * implementations that use ACE_TCHAR* generic pointers, and those
-         * that use void* generic pointers.  It works with the latter
-         * because both ANSI C and C++ allow castless assignment from
-         * any pointer type to void*, and deal with argument conversions
-         * as though doing an assignment.
-         */
-        return (void *) realloc( (ACE_TCHAR *) ptr, size );
-        }
+	{
+	/* The cast to (char *) in the following accommodates both
+	 * implementations that use char* generic pointers, and those
+	 * that use void* generic pointers.  It works with the latter
+	 * because both ANSI C and C++ allow castless assignment from
+	 * any pointer type to void*, and deal with argument conversions
+	 * as though doing an assignment.
+	 */
+	return (void *) realloc( (char *) ptr, size );
+	}
 
 #ifdef ACE_YY_USE_PROTOS
 static void ace_yy_flex_free( void *ptr )
@@ -1802,18 +1801,18 @@ static void ace_yy_flex_free( void *ptr )
 static void ace_yy_flex_free( ptr )
 void *ptr;
 #endif
-        {
-        free( ACE_MALLOC_T (ptr) );
-        }
+	{
+	free( ACE_MALLOC_T (ptr) );
+	}
 
 #if ACE_YY_MAIN
 int main()
-        {
-        ace_yylex();
-        return 0;
-        }
+	{
+	ace_yylex();
+	return 0;
+	}
 #endif
-#line 90 "Svc_Conf.l"
+#line 92 "Svc_Conf.l"
 
 int
 ace_yywrap (void)
@@ -1831,7 +1830,7 @@ ace_yywrap (void)
 void
 ace_yy_delete_parse_buffer (void)
 {
-  if (ace_yy_current_buffer != 0)
+  if (ace_yy_current_buffer != 0) 
     {
       ace_yy_delete_buffer (ace_yy_current_buffer);
       ace_yy_current_buffer = 0;
diff --git a/ace/Svc_Conf_y.cpp b/ace/Svc_Conf_y.cpp
index 7688242ba06..655fdb59f20 100644
--- a/ace/Svc_Conf_y.cpp
+++ b/ace/Svc_Conf_y.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-char ace_yysccsid[] = "@(#)yaccpar      1.4 (Berkeley) 02/25/90 \n\
+char ace_yysccsid[] = "@(#)yaccpar	1.4 (Berkeley) 02/25/90 \n\
  Modified 5/2/90 by J. Roskind to support graphic debugging modes";
 #endif
 #line 2 "Svc_Conf.y"
@@ -17,15 +17,15 @@ static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec,
 static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec,
                                         const ACE_TCHAR *svc_name);
 
-#define ACE_YYDEBUG_LEXER_TEXT (ace_yytext[ace_yyleng] = ACE_LIB_TEXT ('\0'), ace_yytext)
+#define ACE_YYDEBUG_LEXER_TEXT (ace_yytext[ace_yyleng] = '\0', ace_yytext)
 
 /* Force the pretty debugging code to compile.*/
 /* #define ACE_YYDEBUG 1*/
 
 /* Efficient memory allocation technique.*/
-ACE_Obstack_T<ACE_TCHAR> *ace_obstack;
+ACE_Obstack *ace_obstack;
 
-#line 30 "Svc_Conf_y.cpp"
+#line 29 "Svc_Conf_y.cpp"
 #define ACE_DYNAMIC 257
 #define ACE_STATIC 258
 #define ACE_SUSPEND 259
@@ -52,58 +52,58 @@ short ace_yylhs[] = {                                        -1,
     6,    7,    8,    9,   11,   18,   11,   15,   15,   19,
    12,   12,   10,   10,   13,   13,   13,   13,   13,   16,
     4,    4,    4,   17,   17,   17,    3,    3,    3,    2,
-    2,    1,    1,
+    2,    1,    1,    1,
 };
 short ace_yylen[] = {                                         2,
     2,    2,    0,    1,    1,    1,    1,    1,    1,    3,
     3,    2,    2,    2,    3,    0,    4,    1,    1,    0,
     4,    0,    2,    0,    1,    1,    1,    1,    1,    4,
     1,    1,    0,    3,    5,    4,    2,    2,    2,    1,
-    0,    1,    1,
+    0,    1,    1,    1,
 };
 short ace_yydefred[] = {                                      3,
     0,    2,    0,    0,    0,    0,    0,    0,    4,    5,
     6,    7,    8,    9,    1,    0,    0,    0,   12,   13,
    14,   16,   18,   19,    0,    0,    0,    0,    0,   40,
    10,   11,    0,   20,   15,   37,   39,   38,   42,   43,
-    0,    0,    0,   17,   24,    0,    0,   31,   32,   30,
-    0,    0,    0,   21,   25,   26,   27,   28,   29,   23,
-   36,    0,   35,
+   44,    0,    0,    0,   17,   24,    0,    0,   31,   32,
+   30,    0,    0,    0,   21,   25,   26,   27,   28,   29,
+   23,   36,    0,   35,
 };
 short ace_yydgoto[] = {                                       1,
-   42,   31,   29,   50,    9,   10,   11,   12,   13,   51,
-   14,   35,   60,   15,   25,   17,   43,   33,   45,
+   43,   31,   29,   51,    9,   10,   11,   12,   13,   52,
+   14,   35,   61,   15,   25,   17,   44,   33,   46,
 };
 short ace_yysindex[] = {                                      0,
- -228,    0, -266, -260, -254, -246, -244, -247,    0,    0,
+ -228,    0, -267, -260, -254, -250, -246, -247,    0,    0,
     0,    0,    0,    0,    0, -251, -235, -235,    0,    0,
-    0,    0,    0,    0, -237, -249, -238, -236, -252,    0,
+    0,    0,    0,    0, -237, -238, -236, -234, -252,    0,
     0,    0, -237,    0,    0,    0,    0,    0,    0,    0,
- -231, -234, -248,    0,    0, -230, -229,    0,    0,    0,
- -253, -225, -227,    0,    0,    0,    0,    0,    0,    0,
-    0, -224,    0,
+    0, -231, -233, -241,    0,    0, -229, -224,    0,    0,
+    0, -253, -232, -223,    0,    0,    0,    0,    0,    0,
+    0,    0, -222,    0,
 };
 short ace_yyrindex[] = {                                      0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,   27,   27,    0,    0,
     0,    0,    0,    0,   46,    0,    0,    0,    0,    0,
     0,    0,   46,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   20,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    1,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,
+    0,    0,    0,   20,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    1,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,
 };
 short ace_yygindex[] = {                                      0,
-    0,   31,    0,    0,   -8,   -6,   -1,    2,    3,    0,
-    0,   18,    0,    0,    0,    0,    0,    0,    0,
+    0,   31,    0,    0,   -8,   -5,   -1,    2,    3,    0,
+    0,   19,    0,    0,    0,    0,    0,    0,    0,
 };
 #define ACE_YYTABLESIZE 308
 short ace_yytable[] = {                                      23,
-   34,   24,   16,    3,    4,    5,    6,    7,   18,    3,
-    4,   26,   27,   28,   19,   39,   40,   48,   49,   33,
-   54,   22,   20,   41,   21,   36,   41,    2,    3,    4,
-    5,    6,    7,    8,   30,   34,   37,   46,   38,   53,
-   52,   47,   55,   62,   56,   22,   61,   63,   32,   57,
-   44,    0,   58,   59,    0,    0,    0,    0,    0,    0,
+   34,   16,   24,    3,    4,    5,    6,    7,   18,    3,
+    4,   26,   27,   28,   19,   39,   40,   41,   20,   33,
+   55,   22,   21,   42,   49,   50,   41,    2,    3,    4,
+    5,    6,    7,    8,   30,   34,   36,   47,   37,   62,
+   38,   53,   48,   56,   54,   22,   57,   63,   32,   64,
+   58,   45,    0,   59,   60,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
@@ -131,12 +131,12 @@ short ace_yytable[] = {                                      23,
    41,   22,   22,   22,   22,   22,   22,   22,
 };
 short ace_yycheck[] = {                                       8,
-    0,    8,  269,  257,  258,  259,  260,  261,  269,  257,
-  258,  263,  264,  265,  269,  268,  269,  266,  267,    0,
-  274,  269,  269,  276,  269,  275,    0,  256,  257,  258,
-  259,  260,  261,  262,  270,  273,  275,  269,  275,  269,
-  271,  276,   51,  271,   51,    0,  272,  272,   18,   51,
-   33,   -1,   51,   51,   -1,   -1,   -1,   -1,   -1,   -1,
+    0,  269,    8,  257,  258,  259,  260,  261,  269,  257,
+  258,  263,  264,  265,  269,  268,  269,  270,  269,    0,
+  274,  269,  269,  276,  266,  267,    0,  256,  257,  258,
+  259,  260,  261,  262,  270,  273,  275,  269,  275,  272,
+  275,  271,  276,   52,  269,    0,   52,  271,   18,  272,
+   52,   33,   -1,   52,   52,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
@@ -227,6 +227,7 @@ const char *ace_yyrule[] = {
 "parameters_opt :",
 "pathname : ACE_PATHNAME",
 "pathname : ACE_IDENT",
+"pathname : ACE_STRING",
 };
 #endif
 #define ace_yyclearin (ace_yychar=(-1))
@@ -386,7 +387,7 @@ int
 main (int argc, char *argv[])
 {
   ace_yyin = stdin;
-  ace_obstack = new ACE_Obstack_T<ACE_TCHAR>;
+  ace_obstack = new ACE_Obstack;
 
   // Try to reopen any filename argument to use ACE_YYIN.
   if (argc > 1 && (ace_yyin = freopen (argv[1], "r", stdin)) == 0)
@@ -423,7 +424,7 @@ int ace_yyindent;
 #endif /* ACE_YYDEBUG_INDENT */
 #ifndef ACE_YYDEBUG_REDUCE
 #ifdef __cplusplus
-void ACE_YYDEBUG_REDUCE(int /* ace_yynew_state */, int /* ace_yyrule_num */, const char *ace_yyrule_string, int ace_yynew_indent, int ace_yyrhs_count)
+void ACE_YYDEBUG_REDUCE(int ace_yynew_state, int ace_yyrule_num, const char *ace_yyrule_string, int ace_yynew_indent, int ace_yyrhs_count)
 #else
 ACE_YYDEBUG_REDUCE(ace_yynew_state, ace_yyrule_num, ace_yyrule_string, ace_yynew_indent, ace_yyrhs_count)
 int ace_yynew_state;
@@ -453,7 +454,7 @@ int ace_yyrhs_count;
 #endif /* ACE_YYDEBUG_REDUCE */
 #ifndef ACE_YYDEBUG_SHIFT_LEXEME
 #ifdef __cplusplus
-void ACE_YYDEBUG_SHIFT_LEXEME(int /* ace_yyold_state */, int /* ace_yynew_state*/, const char *ace_yytoken_string, int ace_yynew_indent)
+void ACE_YYDEBUG_SHIFT_LEXEME(int ace_yyold_state, int ace_yynew_state, const char *ace_yytoken_string, int ace_yynew_indent)
 #else
 ACE_YYDEBUG_SHIFT_LEXEME(ace_yyold_state, ace_yynew_state, ace_yytoken_string, ace_yynew_indent)
 int ace_yyold_state;
@@ -468,7 +469,7 @@ int ace_yynew_indent;
 #endif /*  ACE_YYDEBUG_SHIFT_LEXEME */
 #ifndef ACE_YYDEBUG_LOOK_AHEAD
 #ifdef __cplusplus
-void ACE_YYDEBUG_LOOK_AHEAD(int /* ace_yynew_state */, int ace_yytoken_num, const char *ace_yytoken_string, int ace_yyindent)
+void ACE_YYDEBUG_LOOK_AHEAD(int ace_yynew_state, int ace_yytoken_num, const char *ace_yytoken_string, int ace_yyindent)
 #else
 ACE_YYDEBUG_LOOK_AHEAD(ace_yynew_state, ace_yytoken_num, ace_yytoken_string, ace_yyindent)
 int ace_yynew_state;
@@ -480,12 +481,12 @@ int ace_yyindent;
     ACE_YYDEBUG_INDENT(ace_yyindent);
     printf("          .... look ahead at %s   `%s'\n",
            ace_yytoken_string,
-           (0 == ace_yytoken_num) ? ACE_LIB_TEXT ("\0") : ACE_YYDEBUG_LEXER_TEXT);
+           (0 == ace_yytoken_num)? "\0": ACE_YYDEBUG_LEXER_TEXT);
 }
 #endif /* ACE_YYDEBUG_LOOK_AHEAD */
 #ifndef ACE_YYDEBUG_DISCARD_STATE
 #ifdef __cplusplus
-void ACE_YYDEBUG_DISCARD_STATE(int /* ace_yynew_state */, int ace_yyindent)
+void ACE_YYDEBUG_DISCARD_STATE(int ace_yynew_state, int ace_yyindent)
 #else
 ACE_YYDEBUG_DISCARD_STATE(ace_yynew_state, ace_yyindent)
 int ace_yynew_state;
@@ -513,7 +514,7 @@ int ace_yyindent;
 #endif /* ACE_YYDEBUG_DISCARD_STATE */
 #ifndef ACE_YYDEBUG_DISCARD_TOKEN
 #ifdef __cplusplus
-void ACE_YYDEBUG_DISCARD_TOKEN(int /* ace_yynew_state */, int /* ace_yytoken_num */, const char *ace_yytoken_string, int ace_yyindent)
+void ACE_YYDEBUG_DISCARD_TOKEN(int ace_yynew_state, int ace_yytoken_num, const char *ace_yytoken_string, int ace_yyindent)
 #else
 ACE_YYDEBUG_DISCARD_TOKEN(ace_yynew_state, ace_yytoken_num, ace_yytoken_string, ace_yyindent)
 int ace_yynew_state;
@@ -528,7 +529,7 @@ int ace_yyindent;
 #endif /* ACE_YYDEBUG_DISCARD_TOKEN */
 #ifndef ACE_YYDEBUG_SHIFT_ERROR_LEXEME
 #ifdef __cplusplus
-void ACE_YYDEBUG_SHIFT_ERROR_LEXEME(int /* ace_yyold_state */, int /* ace_yynew_state */, int ace_yyindent)
+void ACE_YYDEBUG_SHIFT_ERROR_LEXEME(int ace_yyold_state, int ace_yynew_state, int ace_yyindent)
 #else
 ACE_YYDEBUG_SHIFT_ERROR_LEXEME(ace_yyold_state, ace_yynew_state, ace_yyindent)
 int ace_yyold_state;
@@ -554,7 +555,7 @@ ace_yyparse()
     extern char *ace_foo();
 #endif
 
-    if ((ace_yys = ACE_OS::getenv("ACE_YYDEBUG")))
+    if (ace_yys = ACE_OS::getenv("ACE_YYDEBUG"))
     {
         ace_yyn = *ace_yys;
         if (ace_yyn >= '0' && ace_yyn <= '9')
@@ -571,7 +572,7 @@ ace_yyparse()
     *ace_yyssp = ace_yystate = 0;
 
 ace_yyloop:
-    if ((ace_yyn = ace_yydefred[ace_yystate])) goto ace_yyreduce;
+    if (ace_yyn = ace_yydefred[ace_yystate]) goto ace_yyreduce;
     if (ace_yychar < 0)
     {
         if ((ace_yychar = ace_yylex()) < 0) ace_yychar = 0;
@@ -621,7 +622,7 @@ ace_yyloop:
     goto ace_yynewerror;
 #endif
 
-    ace_yyerror(ACE_LIB_TEXT ("syntax error"));
+    ace_yyerror("syntax error");
 #ifdef lint
     goto ace_yyerrlab;
 #endif
@@ -681,7 +682,7 @@ ace_yyinrecovery:
             if (5 < ace_yydebug)
                 printf("ace_yydebug: state %d, error recovery discards token %d (%s)\n",
                     ace_yystate, ace_yychar, ace_yys);
-            else
+            else 
                 ACE_YYDEBUG_DISCARD_TOKEN(ace_yystate, ace_yychar, ace_yys, ace_yyssp-ace_yyss);
         }
 #endif
@@ -702,7 +703,7 @@ ace_yyreduce:
     switch (ace_yyn)
     {
 case 1:
-#line 45 "Svc_Conf.y"
+#line 44 "Svc_Conf.y"
 {
       if (ace_yyvsp[0].parse_node_ != 0)
       {
@@ -712,13 +713,13 @@ case 1:
     }
 break;
 case 2:
-#line 53 "Svc_Conf.y"
+#line 52 "Svc_Conf.y"
 {
       ace_obstack->release ();
     }
 break;
 case 10:
-#line 70 "Svc_Conf.y"
+#line 69 "Svc_Conf.y"
 {
       if (ace_yyvsp[-1].svc_record_ != 0)
         ace_yyval.parse_node_ = new ACE_Dynamic_Node (ace_yyvsp[-1].svc_record_, ace_yyvsp[0].ident_);
@@ -727,74 +728,74 @@ case 10:
     }
 break;
 case 11:
-#line 80 "Svc_Conf.y"
+#line 79 "Svc_Conf.y"
 {
       ace_yyval.parse_node_ = new ACE_Static_Node (ace_yyvsp[-1].ident_, ace_yyvsp[0].ident_);
     }
 break;
 case 12:
-#line 87 "Svc_Conf.y"
+#line 86 "Svc_Conf.y"
 {
       ace_yyval.parse_node_ = new ACE_Suspend_Node (ace_yyvsp[0].ident_);
     }
 break;
 case 13:
-#line 94 "Svc_Conf.y"
+#line 93 "Svc_Conf.y"
 {
       ace_yyval.parse_node_ = new ACE_Resume_Node (ace_yyvsp[0].ident_);
     }
 break;
 case 14:
-#line 101 "Svc_Conf.y"
+#line 100 "Svc_Conf.y"
 {
       ace_yyval.parse_node_ = new ACE_Remove_Node (ace_yyvsp[0].ident_);
     }
 break;
 case 15:
-#line 108 "Svc_Conf.y"
+#line 107 "Svc_Conf.y"
 {
       ace_yyval.parse_node_ = new ACE_Stream_Node (ace_yyvsp[-1].static_node_, ace_yyvsp[0].parse_node_);
     }
 break;
 case 16:
-#line 111 "Svc_Conf.y"
+#line 110 "Svc_Conf.y"
 { ace_yyval.static_node_ = new ACE_Static_Node (ace_yyvsp[0].ident_); }
 break;
 case 17:
-#line 112 "Svc_Conf.y"
+#line 111 "Svc_Conf.y"
 {
       ace_yyval.parse_node_ = new ACE_Dummy_Node (ace_yyvsp[-1].static_node_, ace_yyvsp[0].parse_node_);
     }
 break;
 case 18:
-#line 119 "Svc_Conf.y"
+#line 118 "Svc_Conf.y"
 {
     }
 break;
 case 19:
-#line 122 "Svc_Conf.y"
+#line 121 "Svc_Conf.y"
 {
     }
 break;
 case 20:
-#line 128 "Svc_Conf.y"
+#line 127 "Svc_Conf.y"
 {
       /* Initialize left context...*/
       ace_yyval.static_node_ = ace_yyvsp[-1].static_node_;
     }
 break;
 case 21:
-#line 133 "Svc_Conf.y"
+#line 132 "Svc_Conf.y"
 {
       ace_yyval.parse_node_ = ace_yyvsp[-1].parse_node_;
     }
 break;
 case 22:
-#line 136 "Svc_Conf.y"
+#line 135 "Svc_Conf.y"
 { ace_yyval.parse_node_ = 0; }
 break;
 case 23:
-#line 141 "Svc_Conf.y"
+#line 140 "Svc_Conf.y"
 {
       if (ace_yyvsp[0].parse_node_ != 0)
         {
@@ -804,11 +805,11 @@ case 23:
     }
 break;
 case 24:
-#line 148 "Svc_Conf.y"
+#line 147 "Svc_Conf.y"
 { ace_yyval.parse_node_ = 0; }
 break;
 case 25:
-#line 153 "Svc_Conf.y"
+#line 152 "Svc_Conf.y"
 {
       ACE_Static_Node *svc_type = ace_yyvsp[0].static_node_;
 
@@ -836,7 +837,7 @@ case 25:
     }
 break;
 case 26:
-#line 179 "Svc_Conf.y"
+#line 178 "Svc_Conf.y"
 {
       ACE_Module_Type *mt = ace_get_module (ace_yyvsp[-2].static_node_, ace_yyvsp[0].static_node_->name ());
 
@@ -849,7 +850,7 @@ case 26:
     }
 break;
 case 27:
-#line 190 "Svc_Conf.y"
+#line 189 "Svc_Conf.y"
 {
       ACE_Module_Type *mt = ace_get_module (ace_yyvsp[-2].static_node_,
                                             ace_yyvsp[0].static_node_->name ());
@@ -858,7 +859,7 @@ case 27:
     }
 break;
 case 28:
-#line 197 "Svc_Conf.y"
+#line 196 "Svc_Conf.y"
 {
       ACE_Module_Type *mt = ace_get_module (ace_yyvsp[-2].static_node_,
                                             ace_yyvsp[0].static_node_->name ());
@@ -867,7 +868,7 @@ case 28:
     }
 break;
 case 29:
-#line 204 "Svc_Conf.y"
+#line 203 "Svc_Conf.y"
 {
       ACE_Static_Node *stream = ace_yyvsp[-2].static_node_;
       ACE_Static_Node *module = ace_yyvsp[0].static_node_;
@@ -889,7 +890,7 @@ case 29:
     }
 break;
 case 30:
-#line 227 "Svc_Conf.y"
+#line 226 "Svc_Conf.y"
 {
       u_int flags
         = ACE_Service_Type::DELETE_THIS
@@ -922,61 +923,61 @@ case 30:
     }
 break;
 case 31:
-#line 261 "Svc_Conf.y"
+#line 260 "Svc_Conf.y"
 {
       ace_yyval.type_ = 1;
     }
 break;
 case 32:
-#line 265 "Svc_Conf.y"
+#line 264 "Svc_Conf.y"
 {
       ace_yyval.type_ = 0;
     }
 break;
 case 33:
-#line 269 "Svc_Conf.y"
+#line 268 "Svc_Conf.y"
 {
       ace_yyval.type_ = 1;
     }
 break;
 case 34:
-#line 276 "Svc_Conf.y"
+#line 275 "Svc_Conf.y"
 {
       ace_yyval.location_node_ = new ACE_Object_Node (ace_yyvsp[-2].ident_, ace_yyvsp[0].ident_);
     }
 break;
 case 35:
-#line 280 "Svc_Conf.y"
+#line 279 "Svc_Conf.y"
 {
       ace_yyval.location_node_ = new ACE_Function_Node (ace_yyvsp[-4].ident_, ace_yyvsp[-2].ident_);
     }
 break;
 case 36:
-#line 284 "Svc_Conf.y"
+#line 283 "Svc_Conf.y"
 {
       ace_yyval.location_node_ = new ACE_Static_Function_Node (ace_yyvsp[-2].ident_);
     }
 break;
 case 37:
-#line 291 "Svc_Conf.y"
+#line 290 "Svc_Conf.y"
 {
       ace_yyval.type_ = ACE_MODULE_T;
     }
 break;
 case 38:
-#line 295 "Svc_Conf.y"
+#line 294 "Svc_Conf.y"
 {
       ace_yyval.type_ = ACE_SVC_OBJ_T;
     }
 break;
 case 39:
-#line 299 "Svc_Conf.y"
+#line 298 "Svc_Conf.y"
 {
       ace_yyval.type_ = ACE_STREAM_T;
     }
 break;
 case 41:
-#line 306 "Svc_Conf.y"
+#line 305 "Svc_Conf.y"
 { ace_yyval.ident_ = 0; }
 break;
 #line 983 "Svc_Conf_y.cpp"
@@ -1033,7 +1034,7 @@ to state %d\n", *ace_yyssp, ace_yystate);
     *++ace_yyvsp = ace_yyval;
     goto ace_yyloop;
 ace_yyoverflow:
-    ace_yyerror(ACE_LIB_TEXT ("yacc stack overflow"));
+    ace_yyerror("yacc stack overflow");
 ace_yyabort:
     return (1);
 ace_yyaccept:
diff --git a/include/makeinclude/platform_vxworks5.x_g++.GNU b/include/makeinclude/platform_vxworks5.x_g++.GNU
index 92a1d44ca46..1109563f142 100644
--- a/include/makeinclude/platform_vxworks5.x_g++.GNU
+++ b/include/makeinclude/platform_vxworks5.x_g++.GNU
@@ -46,7 +46,7 @@ endif # WIND_HOST_TYPE
 
 HOST_DIR = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
 
-ifeq (,$(findstring $(HOST_DIR)/bin,$PATH))
+ifeq (,$(findstring $(HOST_DIR)/bin,$(PATH)))
   #### Use := instead of += because += inserts a space.
   PATH := $(PATH):$(HOST_DIR)/bin
 endif # PATH