ChangeLogTag:Tue Oct 30 22:53:57 2001 Ossama Othman <ossama@uci.edu>

5 files changed, 737 insertions, 245 deletions

diff --git a/ChangeLog b/ChangeLog
index b1ddf8bee12..97bb4400917 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Tue Oct 30 22:53:57 2001  Ossama Othman  <ossama@uci.edu>
+
+	* ace/Svc_Conf_l.cpp:
+
+	  Fixed incorrect #line preprocessor directives.
+
+	* etc/Svc_Conf_l.cpp.diff:
+
+	  Regenerated this diff so that it includes recent updates.
+
 Mon Oct 29 20:12:40 2001  Ossama Othman  <ossama@uci.edu>
 
 	* tests/run_test.lst:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index b1ddf8bee12..97bb4400917 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,13 @@
+Tue Oct 30 22:53:57 2001  Ossama Othman  <ossama@uci.edu>
+
+	* ace/Svc_Conf_l.cpp:
+
+	  Fixed incorrect #line preprocessor directives.
+
+	* etc/Svc_Conf_l.cpp.diff:
+
+	  Regenerated this diff so that it includes recent updates.
+
 Mon Oct 29 20:12:40 2001  Ossama Othman  <ossama@uci.edu>
 
 	* tests/run_test.lst:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index b1ddf8bee12..97bb4400917 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,13 @@
+Tue Oct 30 22:53:57 2001  Ossama Othman  <ossama@uci.edu>
+
+	* ace/Svc_Conf_l.cpp:
+
+	  Fixed incorrect #line preprocessor directives.
+
+	* etc/Svc_Conf_l.cpp.diff:
+
+	  Regenerated this diff so that it includes recent updates.
+
 Mon Oct 29 20:12:40 2001  Ossama Othman  <ossama@uci.edu>
 
 	* tests/run_test.lst:
diff --git a/ace/Svc_Conf_l.cpp b/ace/Svc_Conf_l.cpp
index 63a403e616a..067f86211a4 100644
--- a/ace/Svc_Conf_l.cpp
+++ b/ace/Svc_Conf_l.cpp
@@ -686,7 +686,7 @@ ACE_YY_DECL
 	register ACE_TCHAR *ace_yy_cp = 0, *ace_yy_bp = 0;
 	register int ace_yy_act;
 
-#line 40 "Svc_Conf.l"
+#line 35 "Svc_Conf.l"
 
 
 
@@ -777,98 +777,99 @@ case 1:
 ace_yy_c_buf_p = ace_yy_cp -= 1;
 ACE_YY_DO_BEFORE_ACTION; /* set up ace_yytext again */
 ACE_YY_RULE_SETUP
-#line 42 "Svc_Conf.l"
+#line 37 "Svc_Conf.l"
 ; /* EMPTY */
 	ACE_YY_BREAK
 case 2:
 ACE_YY_RULE_SETUP
-#line 43 "Svc_Conf.l"
+#line 38 "Svc_Conf.l"
 { return token (ACE_DYNAMIC); }
         //	ACE_YY_BREAK
 case 3:
 ACE_YY_RULE_SETUP
-#line 44 "Svc_Conf.l"
+#line 39 "Svc_Conf.l"
 { return token (ACE_STATIC); }
 //	ACE_YY_BREAK
 case 4:
 ACE_YY_RULE_SETUP
-#line 45 "Svc_Conf.l"
+#line 40 "Svc_Conf.l"
 { return token (ACE_SUSPEND); }
 //	ACE_YY_BREAK
 case 5:
 ACE_YY_RULE_SETUP
-#line 46 "Svc_Conf.l"
+#line 41 "Svc_Conf.l"
 { return token (ACE_RESUME); }
 //	ACE_YY_BREAK
 case 6:
 ACE_YY_RULE_SETUP
-#line 47 "Svc_Conf.l"
+#line 42 "Svc_Conf.l"
 { return token (ACE_REMOVE); }
 //	ACE_YY_BREAK
 case 7:
 ACE_YY_RULE_SETUP
-#line 48 "Svc_Conf.l"
+#line 43 "Svc_Conf.l"
 { return token (ACE_USTREAM); }
 //	ACE_YY_BREAK
 case 8:
 ACE_YY_RULE_SETUP
-#line 49 "Svc_Conf.l"
+#line 44 "Svc_Conf.l"
 { return token (ACE_MODULE_T); }
 //	ACE_YY_BREAK
 case 9:
 ACE_YY_RULE_SETUP
-#line 50 "Svc_Conf.l"
+#line 45 "Svc_Conf.l"
 { return token (ACE_SVC_OBJ_T); }
 //	ACE_YY_BREAK
 case 10:
 ACE_YY_RULE_SETUP
-#line 51 "Svc_Conf.l"
+#line 46 "Svc_Conf.l"
 { return token (ACE_STREAM_T); }
 //	ACE_YY_BREAK
 case 11:
 ACE_YY_RULE_SETUP
-#line 52 "Svc_Conf.l"
+#line 47 "Svc_Conf.l"
 { return token (ACE_ACTIVE); }
 //	ACE_YY_BREAK
 case 12:
 ACE_YY_RULE_SETUP
-#line 53 "Svc_Conf.l"
+#line 48 "Svc_Conf.l"
 { return token (ACE_INACTIVE); }
 //	ACE_YY_BREAK
 case 13:
 ACE_YY_RULE_SETUP
-#line 54 "Svc_Conf.l"
+#line 49 "Svc_Conf.l"
 { return token (':'); }
 //	ACE_YY_BREAK
 case 14:
 ACE_YY_RULE_SETUP
-#line 55 "Svc_Conf.l"
+#line 50 "Svc_Conf.l"
 { return token ('*'); }
 //	ACE_YY_BREAK
 case 15:
 ACE_YY_RULE_SETUP
-#line 56 "Svc_Conf.l"
+#line 51 "Svc_Conf.l"
 { return token ('('); }
 //	ACE_YY_BREAK
 case 16:
 ACE_YY_RULE_SETUP
-#line 57 "Svc_Conf.l"
+#line 52 "Svc_Conf.l"
 { return token (')'); }
 //	ACE_YY_BREAK
 case 17:
 ACE_YY_RULE_SETUP
-#line 58 "Svc_Conf.l"
+#line 53 "Svc_Conf.l"
 { return token ('{'); }
 //	ACE_YY_BREAK
 case 18:
 ACE_YY_RULE_SETUP
-#line 59 "Svc_Conf.l"
+#line 54 "Svc_Conf.l"
 { return token ('}'); }
 //	ACE_YY_BREAK
 case 19:
 ACE_YY_RULE_SETUP
-#line 60 "Svc_Conf.l"
-{ // Check for first type of string, i.e.,
+#line 55 "Svc_Conf.l"
+{
+                        // Check for first type of string, i.e.,
                         // "double quotes" delimited.
                         ACE_TCHAR *s = ACE_OS::strrchr (ace_yytext, '"');
                         if (s == 0)
@@ -886,7 +887,7 @@ ACE_YY_RULE_SETUP
 //	ACE_YY_BREAK
 case 20:
 ACE_YY_RULE_SETUP
-#line 75 "Svc_Conf.l"
+#line 71 "Svc_Conf.l"
 {
 		        ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext, ace_yyleng);
 			return token (ACE_IDENT);
@@ -894,7 +895,7 @@ ACE_YY_RULE_SETUP
 //	ACE_YY_BREAK
 case 21:
 ACE_YY_RULE_SETUP
-#line 79 "Svc_Conf.l"
+#line 75 "Svc_Conf.l"
 {
 		        ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext, ace_yyleng);
 			return token (ACE_PATHNAME);
@@ -902,18 +903,19 @@ ACE_YY_RULE_SETUP
 //	ACE_YY_BREAK
 case 22:
 ACE_YY_RULE_SETUP
-#line 83 "Svc_Conf.l"
+#line 79 "Svc_Conf.l"
 ; /* EMPTY */
 	ACE_YY_BREAK
 case 23:
 ACE_YY_RULE_SETUP
-#line 84 "Svc_Conf.l"
+#line 80 "Svc_Conf.l"
 { ACE_SVC_CONF_PARAM->yylineno++; ace_yylineno++; }
 	ACE_YY_BREAK
 case 24:
 ACE_YY_RULE_SETUP
-#line 85 "Svc_Conf.l"
-{ ACE_ERROR ((LM_ERROR,
+#line 81 "Svc_Conf.l"
+{
+                    ACE_ERROR ((LM_ERROR,
                                 ACE_LIB_TEXT ("unknown character = (%d"),
                                           *ace_yytext));
                         if (ACE_OS::ace_isprint (*ace_yytext))
@@ -924,12 +926,12 @@ ACE_YY_RULE_SETUP
 case ACE_YY_STATE_EOF(INITIAL):
 case ACE_YY_STATE_EOF(PARAMETERS):
 case ACE_YY_STATE_EOF(NORMAL):
-#line 92 "Svc_Conf.l"
-{ /* ACE_YY_NEW_FILE; */ ace_yyterminate(); }
+#line 89 "Svc_Conf.l"
+{ ace_yyterminate(); }
 //	ACE_YY_BREAK
 case 25:
 ACE_YY_RULE_SETUP
-#line 93 "Svc_Conf.l"
+#line 90 "Svc_Conf.l"
 ACE_SVC_CONF_ECHO;
 	ACE_YY_BREAK
 
@@ -1818,7 +1820,7 @@ int main()
 	return 0;
 	}
 #endif
-#line 93 "Svc_Conf.l"
+#line 90 "Svc_Conf.l"
 
 int
 ace_yywrap (void)
@@ -1866,7 +1868,6 @@ ace_yy_push_buffer (const ACE_TCHAR *directive, ace_yy_buffer_state *&buffer)
 void
 ace_yy_pop_buffer (ace_yy_buffer_state *buffer)
 {
-
   // External synchronization is required.
 
   ace_yy_switch_to_buffer (buffer);
diff --git a/etc/Svc_Conf_l.cpp.diff b/etc/Svc_Conf_l.cpp.diff
index c038b0f316f..e48b92352e9 100644
--- a/etc/Svc_Conf_l.cpp.diff
+++ b/etc/Svc_Conf_l.cpp.diff
@@ -1,213 +1,674 @@
-*** Svc_Conf_l.cpp.orig	Sat Jan 15 12:47:17 2000
---- Svc_Conf_l.cpp	Sat Jan 15 12:49:44 2000
-***************
-*** 1 ****
---- 1,2 ----
-+ #define ACE_YY_NO_UNPUT
-  /* A lexical scanner generated by flex */
-***************
-*** 134,136 ****
---- 135,139 ----
-  
-+ #if 0
-  #define unput(c) ace_yyunput( c, ace_yytext_ptr )
-+ #endif /* 0 */
-  
-***************
-*** 680,682 ****
-  	register ace_yy_state_type ace_yy_current_state;
-! 	register char *ace_yy_cp, *ace_yy_bp;
-  	register int ace_yy_act;
---- 683,685 ----
-  	register ace_yy_state_type ace_yy_current_state;
-! 	register char *ace_yy_cp = 0, *ace_yy_bp = 0;
-  	register int ace_yy_act;
-***************
-*** 781,783 ****
-  { return token (ACE_DYNAMIC); }
-! 	ACE_YY_BREAK
-  case 3:
---- 784,786 ----
-  { return token (ACE_DYNAMIC); }
-!         //	ACE_YY_BREAK
-  case 3:
-***************
-*** 786,788 ****
-  { return token (ACE_STATIC); }
-! 	ACE_YY_BREAK
-  case 4:
---- 789,791 ----
-  { return token (ACE_STATIC); }
-! //	ACE_YY_BREAK
-  case 4:
-***************
-*** 791,793 ****
-  { return token (ACE_SUSPEND); }
-! 	ACE_YY_BREAK
-  case 5:
---- 794,796 ----
-  { return token (ACE_SUSPEND); }
-! //	ACE_YY_BREAK
-  case 5:
-***************
-*** 796,798 ****
-  { return token (ACE_RESUME); }
-! 	ACE_YY_BREAK
-  case 6:
---- 799,801 ----
-  { return token (ACE_RESUME); }
-! //	ACE_YY_BREAK
-  case 6:
-***************
-*** 801,803 ****
-  { return token (ACE_REMOVE); }
-! 	ACE_YY_BREAK
-  case 7:
---- 804,806 ----
-  { return token (ACE_REMOVE); }
-! //	ACE_YY_BREAK
-  case 7:
-***************
-*** 806,808 ****
-  { return token (ACE_USTREAM); }
-! 	ACE_YY_BREAK
-  case 8:
---- 809,811 ----
-  { return token (ACE_USTREAM); }
-! //	ACE_YY_BREAK
-  case 8:
-***************
-*** 811,813 ****
-  { return token (ACE_MODULE_T); }
-! 	ACE_YY_BREAK
-  case 9:
---- 814,816 ----
-  { return token (ACE_MODULE_T); }
-! //	ACE_YY_BREAK
-  case 9:
-***************
-*** 816,818 ****
-  { return token (ACE_SVC_OBJ_T); }
-! 	ACE_YY_BREAK
-  case 10:
---- 819,821 ----
-  { return token (ACE_SVC_OBJ_T); }
-! //	ACE_YY_BREAK
-  case 10:
-***************
-*** 821,823 ****
-  { return token (ACE_STREAM_T); }
-! 	ACE_YY_BREAK
-  case 11:
---- 824,826 ----
-  { return token (ACE_STREAM_T); }
-! //	ACE_YY_BREAK
-  case 11:
-***************
-*** 826,828 ****
-  { return token (ACE_ACTIVE); }
-! 	ACE_YY_BREAK
-  case 12:
---- 829,831 ----
-  { return token (ACE_ACTIVE); }
-! //	ACE_YY_BREAK
-  case 12:
-***************
-*** 831,833 ****
-  { return token (ACE_INACTIVE); }
-! 	ACE_YY_BREAK
-  case 13:
---- 834,836 ----
-  { return token (ACE_INACTIVE); }
-! //	ACE_YY_BREAK
-  case 13:
-***************
-*** 836,838 ****
-  { return token (ACE_COLON); }
-! 	ACE_YY_BREAK
-  case 14:
---- 839,841 ----
-  { return token (ACE_COLON); }
-! //	ACE_YY_BREAK
-  case 14:
-***************
-*** 841,843 ****
-  { return token (ACE_STAR); }
-! 	ACE_YY_BREAK
-  case 15:
---- 844,846 ----
-  { return token (ACE_STAR); }
-! //	ACE_YY_BREAK
-  case 15:
-***************
-*** 846,848 ****
-  { return token (ACE_LPAREN); }
-! 	ACE_YY_BREAK
-  case 16:
---- 849,851 ----
-  { return token (ACE_LPAREN); }
-! //	ACE_YY_BREAK
-  case 16:
-***************
-*** 851,853 ****
-  { return token (ACE_RPAREN); }
-! 	ACE_YY_BREAK
-  case 17:
---- 854,856 ----
-  { return token (ACE_RPAREN); }
-! //	ACE_YY_BREAK
-  case 17:
-***************
-*** 856,858 ****
-  { return token (ACE_LBRACE); }
-! 	ACE_YY_BREAK
-  case 18:
---- 859,861 ----
-  { return token (ACE_LBRACE); }
-! //	ACE_YY_BREAK
-  case 18:
-***************
-*** 861,863 ****
-  { return token (ACE_RBRACE); }
-! 	ACE_YY_BREAK
-  case 19:
---- 864,866 ----
-  { return token (ACE_RBRACE); }
-! //	ACE_YY_BREAK
-  case 19:
-***************
-*** 880,882 ****
-  			return token (ACE_STRING); }
-! 	ACE_YY_BREAK
-  case 20:
---- 883,885 ----
-  			return token (ACE_STRING); }
-! //	ACE_YY_BREAK
-  case 20:
-***************
-*** 888,890 ****
-  		      }
-! 	ACE_YY_BREAK
-  case 21:
---- 891,893 ----
-  		      }
-! //	ACE_YY_BREAK
-  case 21:
-***************
-*** 896,898 ****
-  		      }
-! 	ACE_YY_BREAK
-  case 22:
---- 899,901 ----
-  		      }
-! //	ACE_YY_BREAK
-  case 22:
-***************
-*** 925,927 ****
-  { ACE_YY_NEW_FILE; ace_yyterminate(); }
-! 	ACE_YY_BREAK
-  case 25:
---- 925,927 ----
-  { ACE_YY_NEW_FILE; ace_yyterminate(); }
-! //	ACE_YY_BREAK
-  case 25:
+--- Svc_Conf_l.cpp.old	Tue Oct 30 22:27:20 2001
++++ Svc_Conf_l.cpp	Tue Oct 30 22:43:02 2001
+@@ -1,15 +1,14 @@
++#define ACE_YY_NO_UNPUT
+ /* A lexical scanner generated by flex */
+ 
+ /* Scanner skeleton version:
+- * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
++ * $Header: /project/cvs-repository/ACE_wrappers-repository/ace/Svc_Conf_l.cpp,v 4.52 2001/10/22 21:59:31 crodrigu Exp $
+  */
+ 
+ #define FLEX_SCANNER
+ #define ACE_YY_FLEX_MAJOR_VERSION 2
+ #define ACE_YY_FLEX_MINOR_VERSION 5
+ 
+-#include "ace/OS.h"
+-
+ 
+ /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
+ #ifdef c_plusplus
+@@ -21,8 +20,8 @@
+ 
+ #ifdef __cplusplus
+ 
+-#include /**/ <stdlib.h>
+ #include "ace/OS.h"
++#include "ace/Object_Manager.h"
+ 
+ /* Use prototypes in function declarations. */
+ #define ACE_YY_USE_PROTOS
+@@ -132,7 +131,9 @@
+ 		} \
+ 	while ( 0 )
+ 
++#if 0
+ #define unput(c) ace_yyunput( c, ace_yytext_ptr )
++#endif /* 0 */
+ 
+ /* The following is because we cannot portably get our hands on size_t
+  * (without autoconf's help, which isn't available because we want
+@@ -145,8 +146,8 @@
+ 	{
+ 	FILE *ace_yy_input_file;
+ 
+-	char *ace_yy_ch_buf;		/* input buffer */
+-	char *ace_yy_buf_pos;		/* current position in input buffer */
++	ACE_TCHAR *ace_yy_ch_buf;		/* input buffer */
++	ACE_TCHAR *ace_yy_buf_pos;		/* current position in input buffer */
+ 
+ 	/* Size of input buffer in bytes, not including room for EOB
+ 	 * characters.
+@@ -208,7 +209,7 @@
+ 
+ 
+ /* ace_yy_hold_char holds the character lost when ace_yytext is formed. */
+-static char ace_yy_hold_char;
++static ACE_TCHAR ace_yy_hold_char;
+ 
+ static int ace_yy_n_chars;		/* number of characters read into ace_yy_ch_buf */
+ 
+@@ -216,7 +217,7 @@
+ int ace_yyleng;
+ 
+ /* Points to current character in buffer. */
+-static char *ace_yy_c_buf_p = (char *) 0;
++static ACE_TCHAR *ace_yy_c_buf_p = (ACE_TCHAR *) 0;
+ static int ace_yy_init = 1;		/* whether we need to initialize */
+ static int ace_yy_start = 0;	/* start state number */
+ 
+@@ -235,9 +236,9 @@
+ void ace_yy_flush_buffer ACE_YY_PROTO(( ACE_YY_BUFFER_STATE b ));
+ #define ACE_YY_FLUSH_BUFFER ace_yy_flush_buffer( ace_yy_current_buffer )
+ 
+-ACE_YY_BUFFER_STATE ace_yy_scan_buffer ACE_YY_PROTO(( char *base, ace_yy_size_t size ));
+-ACE_YY_BUFFER_STATE ace_yy_scan_string ACE_YY_PROTO(( ace_yyconst char *ace_yy_str ));
+-ACE_YY_BUFFER_STATE ace_yy_scan_bytes ACE_YY_PROTO(( ace_yyconst char *bytes, int len ));
++ACE_YY_BUFFER_STATE ace_yy_scan_buffer ACE_YY_PROTO(( ACE_TCHAR *base, ace_yy_size_t size ));
++ACE_YY_BUFFER_STATE ace_yy_scan_string ACE_YY_PROTO(( ace_yyconst ACE_TCHAR *ace_yy_str ));
++ACE_YY_BUFFER_STATE ace_yy_scan_bytes ACE_YY_PROTO(( ace_yyconst ACE_TCHAR *bytes, int len ));
+ 
+ static void *ace_yy_flex_alloc ACE_YY_PROTO(( ace_yy_size_t ));
+ static void *ace_yy_flex_realloc ACE_YY_PROTO(( void *, ace_yy_size_t ));
+@@ -261,16 +262,16 @@
+ 
+ #define ACE_YY_AT_BOL() (ace_yy_current_buffer->ace_yy_at_bol)
+ 
+-typedef unsigned char ACE_YY_CHAR;
++typedef ACE_TCHAR ACE_YY_CHAR;
+ FILE *ace_yyin = (FILE *) 0, *ace_yyout = (FILE *) 0;
+ typedef int ace_yy_state_type;
+-extern char *ace_yytext;
++extern ACE_TCHAR *ace_yytext;
+ #define ace_yytext_ptr ace_yytext
+ 
+ static ace_yy_state_type ace_yy_get_previous_state ACE_YY_PROTO(( void ));
+ static ace_yy_state_type ace_yy_try_NUL_trans ACE_YY_PROTO(( ace_yy_state_type current_state ));
+ static int ace_yy_get_next_buffer ACE_YY_PROTO(( void ));
+-static void ace_yy_fatal_error ACE_YY_PROTO(( ace_yyconst char msg[] ));
++static void ace_yy_fatal_error ACE_YY_PROTO(( ace_yyconst ACE_TCHAR msg[] ));
+ 
+ /* Done after the current pattern has been matched and before the
+  * corresponding action - sets up ace_yytext.
+@@ -490,7 +491,7 @@
+     } ;
+ 
+ static ace_yy_state_type ace_yy_last_accepting_state;
+-static char *ace_yy_last_accepting_cpos;
++static ACE_TCHAR *ace_yy_last_accepting_cpos;
+ 
+ /* The intent behind this definition is that it'll catch
+  * any uses of REJECT which flex missed.
+@@ -499,11 +500,11 @@
+ #define ace_yymore() ace_yymore_used_but_not_detected
+ #define ACE_YY_MORE_ADJ 0
+ #define ACE_YY_RESTORE_ACE_YY_MORE_OFFSET
+-char *ace_yytext;
++ACE_TCHAR *ace_yytext;
+ #line 1 "Svc_Conf.l"
+ #define INITIAL 0
+ #line 2 "Svc_Conf.l"
+-// $Id: Svc_Conf.l,v 4.17 2001/10/17 06:14:08 othman Exp $
++// $Id: Svc_Conf_l.cpp,v 4.52 2001/10/22 21:59:31 crodrigu Exp $
+ // Sample lexical analysis for regular expression subset.  Must be
+ // compiled with FLEX and an ANSI C++ compiler.
+ 
+@@ -514,7 +515,7 @@
+ 
+ ACE_RCSID (ace,
+ 	   Svc_Conf_l,
+-	   "$Id: Svc_Conf.l,v 4.17 2001/10/17 06:14:08 othman Exp $")
++	   "$Id: Svc_Conf_l.cpp,v 4.52 2001/10/22 21:59:31 crodrigu Exp $")
+ 
+ // Keeps track of the current line for debugging output.
+ int ace_yylineno = 1;
+@@ -538,15 +539,15 @@
+ #endif
+ 
+ #ifndef ACE_YY_NO_UNPUT
+-static void ace_yyunput ACE_YY_PROTO(( int c, char *buf_ptr ));
++static void ace_yyunput ACE_YY_PROTO(( int c, ACE_TCHAR *buf_ptr ));
+ #endif
+ 
+ #ifndef ace_yytext_ptr
+-static void ace_yy_flex_strncpy ACE_YY_PROTO(( char *, ace_yyconst char *, int ));
++static void ace_yy_flex_strncpy ACE_YY_PROTO(( ACE_TCHAR *, ace_yyconst ACE_TCHAR *, int ));
+ #endif
+ 
+ #ifdef ACE_YY_NEED_STRLEN
+-static int ace_yy_flex_strlen ACE_YY_PROTO(( ace_yyconst char * ));
++static int ace_yy_flex_strlen ACE_YY_PROTO(( ace_yyconst ACE_TCHAR * ));
+ #endif
+ 
+ #ifndef ACE_YY_NO_INPUT
+@@ -616,16 +617,16 @@
+ 		int c = '*', n; \
+ 		for ( n = 0; n < max_size && \
+ 			     (c = getc( ace_yyin )) != EOF && c != '\n'; ++n ) \
+-			buf[n] = (char) c; \
++			buf[n] = (ACE_TCHAR) c; \
+ 		if ( c == '\n' ) \
+-			buf[n++] = (char) c; \
++			buf[n++] = (ACE_TCHAR) c; \
+ 		if ( c == EOF && ferror( ace_yyin ) ) \
+-			ACE_YY_FATAL_ERROR( "input in flex scanner failed" ); \
++			ACE_YY_FATAL_ERROR (ACE_LIB_TEXT ("input in flex scanner failed")); \
+ 		result = n; \
+ 		} \
+-	else if ( ((result = fread( buf, 1, max_size, ace_yyin )) == 0) \
++	else if ( ((result = fread( buf, sizeof (ACE_TCHAR), max_size, ace_yyin )) == 0) \
+ 		  && ferror( ace_yyin ) ) \
+-		ACE_YY_FATAL_ERROR( "input in flex scanner failed" );
++		ACE_YY_FATAL_ERROR (ACE_LIB_TEXT ("input in flex scanner failed"));
+ #endif
+ 
+ /* No semi-colon after return; correct usage is to write "ace_yyterminate();" -
+@@ -673,8 +674,16 @@
+ 
+ ACE_YY_DECL
+ 	{
++
++          ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX,
++                                    ace_mon,
++                                    *ACE_Static_Object_Lock::instance (),
++                                    -1));
++
++          ACE_Svc_Conf_Lexer_Guard ace_lexer_guard (ACE_SVC_CONF_PARAM);
++
+ 	register ace_yy_state_type ace_yy_current_state;
+-	register char *ace_yy_cp, *ace_yy_bp;
++	register ACE_TCHAR *ace_yy_cp = 0, *ace_yy_bp = 0;
+ 	register int ace_yy_act;
+ 
+ #line 35 "Svc_Conf.l"
+@@ -775,93 +784,93 @@
+ ACE_YY_RULE_SETUP
+ #line 38 "Svc_Conf.l"
+ { return token (ACE_DYNAMIC); }
+-	ACE_YY_BREAK
++        //	ACE_YY_BREAK
+ case 3:
+ ACE_YY_RULE_SETUP
+ #line 39 "Svc_Conf.l"
+ { return token (ACE_STATIC); }
+-	ACE_YY_BREAK
++//	ACE_YY_BREAK
+ case 4:
+ ACE_YY_RULE_SETUP
+ #line 40 "Svc_Conf.l"
+ { return token (ACE_SUSPEND); }
+-	ACE_YY_BREAK
++//	ACE_YY_BREAK
+ case 5:
+ ACE_YY_RULE_SETUP
+ #line 41 "Svc_Conf.l"
+ { return token (ACE_RESUME); }
+-	ACE_YY_BREAK
++//	ACE_YY_BREAK
+ case 6:
+ ACE_YY_RULE_SETUP
+ #line 42 "Svc_Conf.l"
+ { return token (ACE_REMOVE); }
+-	ACE_YY_BREAK
++//	ACE_YY_BREAK
+ case 7:
+ ACE_YY_RULE_SETUP
+ #line 43 "Svc_Conf.l"
+ { return token (ACE_USTREAM); }
+-	ACE_YY_BREAK
++//	ACE_YY_BREAK
+ case 8:
+ ACE_YY_RULE_SETUP
+ #line 44 "Svc_Conf.l"
+ { return token (ACE_MODULE_T); }
+-	ACE_YY_BREAK
++//	ACE_YY_BREAK
+ case 9:
+ ACE_YY_RULE_SETUP
+ #line 45 "Svc_Conf.l"
+ { return token (ACE_SVC_OBJ_T); }
+-	ACE_YY_BREAK
++//	ACE_YY_BREAK
+ case 10:
+ ACE_YY_RULE_SETUP
+ #line 46 "Svc_Conf.l"
+ { return token (ACE_STREAM_T); }
+-	ACE_YY_BREAK
++//	ACE_YY_BREAK
+ case 11:
+ ACE_YY_RULE_SETUP
+ #line 47 "Svc_Conf.l"
+ { return token (ACE_ACTIVE); }
+-	ACE_YY_BREAK
++//	ACE_YY_BREAK
+ case 12:
+ ACE_YY_RULE_SETUP
+ #line 48 "Svc_Conf.l"
+ { return token (ACE_INACTIVE); }
+-	ACE_YY_BREAK
++//	ACE_YY_BREAK
+ case 13:
+ ACE_YY_RULE_SETUP
+ #line 49 "Svc_Conf.l"
+ { return token (':'); }
+-	ACE_YY_BREAK
++//	ACE_YY_BREAK
+ case 14:
+ ACE_YY_RULE_SETUP
+ #line 50 "Svc_Conf.l"
+ { return token ('*'); }
+-	ACE_YY_BREAK
++//	ACE_YY_BREAK
+ case 15:
+ ACE_YY_RULE_SETUP
+ #line 51 "Svc_Conf.l"
+ { return token ('('); }
+-	ACE_YY_BREAK
++//	ACE_YY_BREAK
+ case 16:
+ ACE_YY_RULE_SETUP
+ #line 52 "Svc_Conf.l"
+ { return token (')'); }
+-	ACE_YY_BREAK
++//	ACE_YY_BREAK
+ case 17:
+ ACE_YY_RULE_SETUP
+ #line 53 "Svc_Conf.l"
+ { return token ('{'); }
+-	ACE_YY_BREAK
++//	ACE_YY_BREAK
+ case 18:
+ ACE_YY_RULE_SETUP
+ #line 54 "Svc_Conf.l"
+ { return token ('}'); }
+-	ACE_YY_BREAK
++//	ACE_YY_BREAK
+ case 19:
+ ACE_YY_RULE_SETUP
+ #line 55 "Svc_Conf.l"
+ {
+                         // Check for first type of string, i.e.,
+-                        // "double quotes" delimited.  
++                        // "double quotes" delimited.
+                         ACE_TCHAR *s = ACE_OS::strrchr (ace_yytext, '"');
+                         if (s == 0)
+                           // Check for second type of string, i.e.,
+@@ -875,7 +884,7 @@
+ 			ace_yyleng -= 1;
+                         ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext + 1, ace_yyleng);
+ 			return token (ACE_STRING); }
+-	ACE_YY_BREAK
++//	ACE_YY_BREAK
+ case 20:
+ ACE_YY_RULE_SETUP
+ #line 71 "Svc_Conf.l"
+@@ -883,7 +892,7 @@
+ 		        ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext, ace_yyleng);
+ 			return token (ACE_IDENT);
+ 		      }
+-	ACE_YY_BREAK
++//	ACE_YY_BREAK
+ case 21:
+ ACE_YY_RULE_SETUP
+ #line 75 "Svc_Conf.l"
+@@ -891,7 +900,7 @@
+ 		        ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext, ace_yyleng);
+ 			return token (ACE_PATHNAME);
+ 		      }
+-	ACE_YY_BREAK
++//	ACE_YY_BREAK
+ case 22:
+ ACE_YY_RULE_SETUP
+ #line 79 "Svc_Conf.l"
+@@ -900,15 +909,15 @@
+ case 23:
+ ACE_YY_RULE_SETUP
+ #line 80 "Svc_Conf.l"
+-{ ACE_SVC_CONF_PARAM->ace_yylineno++; ace_ace_yylineno++; }
++{ ACE_SVC_CONF_PARAM->yylineno++; ace_yylineno++; }
+ 	ACE_YY_BREAK
+ case 24:
+ ACE_YY_RULE_SETUP
+ #line 81 "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")));
+@@ -919,7 +928,7 @@
+ case ACE_YY_STATE_EOF(NORMAL):
+ #line 89 "Svc_Conf.l"
+ { ace_yyterminate(); }
+-	ACE_YY_BREAK
++//	ACE_YY_BREAK
+ case 25:
+ ACE_YY_RULE_SETUP
+ #line 90 "Svc_Conf.l"
+@@ -928,7 +937,7 @@
+ 
+ 	case ACE_YY_END_OF_BUFFER:
+ 		{
+-		/* Amount of text matched not including the EOB char. */
++		/* Amount of text matched not including the EOB ACE_TCHAR. */
+ 		int ace_yy_amount_of_matched_text = (int) (ace_yy_cp - ace_yytext_ptr) - 1;
+ 
+ 		/* Undo the effects of ACE_YY_DO_BEFORE_ACTION. */
+@@ -1050,7 +1059,7 @@
+ 
+ 	default:
+ 		ACE_YY_FATAL_ERROR(
+-			"fatal flex scanner internal error--no action found" );
++			ACE_LIB_TEXT ("fatal flex scanner internal error--no action found"));
+ 	} /* end of action switch */
+ 		} /* end of scanning one token */
+ 	} /* end of ace_yylex */
+@@ -1066,14 +1075,14 @@
+ 
+ static int ace_yy_get_next_buffer()
+ 	{
+-	register char *dest = ace_yy_current_buffer->ace_yy_ch_buf;
+-	register char *source = ace_yytext_ptr;
++	register ACE_TCHAR *dest = ace_yy_current_buffer->ace_yy_ch_buf;
++	register ACE_TCHAR *source = ace_yytext_ptr;
+ 	register int number_to_move, i;
+ 	int ret_val;
+ 
+ 	if ( ace_yy_c_buf_p > &ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars + 1] )
+ 		ACE_YY_FATAL_ERROR(
+-		"fatal flex scanner internal error--end of buffer missed" );
++		ACE_LIB_TEXT ("fatal flex scanner internal error--end of buffer missed"));
+ 
+ 	if ( ace_yy_current_buffer->ace_yy_fill_buffer == 0 )
+ 		{ /* Don't try to fill the buffer, so this is an EOF. */
+@@ -1117,7 +1126,7 @@
+ 			{ /* Not enough room in the buffer - grow it. */
+ #ifdef ACE_YY_USES_REJECT
+ 			ACE_YY_FATAL_ERROR(
+-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
++ACE_LIB_TEXT ("input buffer overflow, can't enlarge buffer because scanner uses REJECT"));
+ #else
+ 
+ 			/* just a shorter name for the current buffer */
+@@ -1135,10 +1144,11 @@
+ 				else
+ 					b->ace_yy_buf_size *= 2;
+ 
+-				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 );
++				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) * sizeof (ACE_TCHAR) );
+ 				}
+ 			else
+ 				/* Can't grow it, we don't own it. */
+@@ -1146,7 +1156,7 @@
+ 
+ 			if ( ! b->ace_yy_ch_buf )
+ 				ACE_YY_FATAL_ERROR(
+-				"fatal error - scanner input buffer overflow" );
++				ACE_LIB_TEXT ("fatal error - scanner input buffer overflow"));
+ 
+ 			ace_yy_c_buf_p = &b->ace_yy_ch_buf[ace_yy_c_buf_p_offset];
+ 
+@@ -1155,8 +1165,8 @@
+ #endif
+ 			}
+ 
+-		if ( num_to_read > ACE_YY_READ_BUF_SIZE )
+-			num_to_read = ACE_YY_READ_BUF_SIZE;
++		if ( num_to_read * sizeof (ACE_TCHAR) > ACE_YY_READ_BUF_SIZE )
++			num_to_read = ACE_YY_READ_BUF_SIZE / sizeof (ACE_TCHAR);
+ 
+ 		/* Read in more data. */
+ 		ACE_YY_INPUT( (&ace_yy_current_buffer->ace_yy_ch_buf[number_to_move]),
+@@ -1194,12 +1204,12 @@
+ 	}
+ 
+ 
+-/* ace_yy_get_previous_state - get the state just before the EOB char was reached */
++/* ace_yy_get_previous_state - get the state just before the EOB ACE_TCHAR was reached */
+ 
+ static ace_yy_state_type ace_yy_get_previous_state()
+ 	{
+ 	register ace_yy_state_type ace_yy_current_state;
+-	register char *ace_yy_cp;
++	register ACE_TCHAR *ace_yy_cp;
+ 
+ 	ace_yy_current_state = ace_yy_start;
+ 	ace_yy_current_state += ACE_YY_AT_BOL();
+@@ -1239,7 +1249,7 @@
+ #endif
+ 	{
+ 	register int ace_yy_is_jam;
+-	register char *ace_yy_cp = ace_yy_c_buf_p;
++	register ACE_TCHAR *ace_yy_cp = ace_yy_c_buf_p;
+ 
+ 	register ACE_YY_CHAR ace_yy_c = 1;
+ 	if ( ace_yy_accept[ace_yy_current_state] )
+@@ -1262,14 +1272,14 @@
+ 
+ #ifndef ACE_YY_NO_UNPUT
+ #ifdef ACE_YY_USE_PROTOS
+-static void ace_yyunput( int c, register char *ace_yy_bp )
++static void ace_yyunput( int c, register ACE_TCHAR *ace_yy_bp )
+ #else
+ static void ace_yyunput( c, ace_yy_bp )
+ int c;
+-register char *ace_yy_bp;
++register ACE_TCHAR *ace_yy_bp;
+ #endif
+ 	{
+-	register char *ace_yy_cp = ace_yy_c_buf_p;
++	register ACE_TCHAR *ace_yy_cp = ace_yy_c_buf_p;
+ 
+ 	/* undo effects of setting up ace_yytext */
+ 	*ace_yy_cp = ace_yy_hold_char;
+@@ -1278,9 +1288,9 @@
+ 		{ /* need to shift things up to make room */
+ 		/* +2 for EOB chars. */
+ 		register int number_to_move = ace_yy_n_chars + 2;
+-		register char *dest = &ace_yy_current_buffer->ace_yy_ch_buf[
++		register ACE_TCHAR *dest = &ace_yy_current_buffer->ace_yy_ch_buf[
+ 					ace_yy_current_buffer->ace_yy_buf_size + 2];
+-		register char *source =
++		register ACE_TCHAR *source =
+ 				&ace_yy_current_buffer->ace_yy_ch_buf[number_to_move];
+ 
+ 		while ( source > ace_yy_current_buffer->ace_yy_ch_buf )
+@@ -1292,10 +1302,10 @@
+ 			ace_yy_n_chars = ace_yy_current_buffer->ace_yy_buf_size;
+ 
+ 		if ( ace_yy_cp < ace_yy_current_buffer->ace_yy_ch_buf + 2 )
+-			ACE_YY_FATAL_ERROR( "flex scanner push-back overflow" );
++			ACE_YY_FATAL_ERROR (ACE_LIB_TEXT ("flex scanner push-back overflow"));
+ 		}
+ 
+-	*--ace_yy_cp = (char) c;
++	*--ace_yy_cp = (ACE_TCHAR) c;
+ 
+ 
+ 	ace_yytext_ptr = ace_yy_bp;
+@@ -1369,7 +1379,7 @@
+ 			}
+ 		}
+ 
+-	c = *(unsigned char *) ace_yy_c_buf_p;	/* cast for 8-bit char's */
++	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;
+ 
+@@ -1449,16 +1459,16 @@
+ 
+ 	b = (ACE_YY_BUFFER_STATE) ace_yy_flex_alloc( sizeof( struct ace_yy_buffer_state ) );
+ 	if ( ! b )
+-		ACE_YY_FATAL_ERROR( "out of dynamic memory in ace_yy_create_buffer()" );
++		ACE_YY_FATAL_ERROR (ACE_LIB_TEXT ("out of dynamic memory in ace_yy_create_buffer()"));
+ 
+ 	b->ace_yy_buf_size = size;
+ 
+ 	/* ace_yy_ch_buf has to be 2 characters longer than the size given because
+ 	 * we need to put in 2 end-of-buffer characters.
+ 	 */
+-	b->ace_yy_ch_buf = (char *) ace_yy_flex_alloc( b->ace_yy_buf_size + 2 );
++	b->ace_yy_ch_buf = (ACE_TCHAR *) ace_yy_flex_alloc( (b->ace_yy_buf_size + 2) * sizeof (ACE_TCHAR) );
+ 	if ( ! b->ace_yy_ch_buf )
+-		ACE_YY_FATAL_ERROR( "out of dynamic memory in ace_yy_create_buffer()" );
++		ACE_YY_FATAL_ERROR (ACE_LIB_TEXT ("out of dynamic memory in ace_yy_create_buffer()"));
+ 
+ 	b->ace_yy_is_our_buffer = 1;
+ 
+@@ -1553,10 +1563,10 @@
+ 
+ #ifndef ACE_YY_NO_SCAN_BUFFER
+ #ifdef ACE_YY_USE_PROTOS
+-ACE_YY_BUFFER_STATE ace_yy_scan_buffer( char *base, ace_yy_size_t size )
++ACE_YY_BUFFER_STATE ace_yy_scan_buffer( ACE_TCHAR *base, ace_yy_size_t size )
+ #else
+ ACE_YY_BUFFER_STATE ace_yy_scan_buffer( base, size )
+-char *base;
++ACE_TCHAR *base;
+ ace_yy_size_t size;
+ #endif
+ 	{
+@@ -1570,7 +1580,7 @@
+ 
+ 	b = (ACE_YY_BUFFER_STATE) ace_yy_flex_alloc( sizeof( struct ace_yy_buffer_state ) );
+ 	if ( ! b )
+-		ACE_YY_FATAL_ERROR( "out of dynamic memory in ace_yy_scan_buffer()" );
++		ACE_YY_FATAL_ERROR(ACE_LIB_TEXT ("out of dynamic memory in ace_yy_scan_buffer()"));
+ 
+ 	b->ace_yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+ 	b->ace_yy_buf_pos = b->ace_yy_ch_buf = base;
+@@ -1591,10 +1601,10 @@
+ 
+ #ifndef ACE_YY_NO_SCAN_STRING
+ #ifdef ACE_YY_USE_PROTOS
+-ACE_YY_BUFFER_STATE ace_yy_scan_string( ace_yyconst char *ace_yy_str )
++ACE_YY_BUFFER_STATE ace_yy_scan_string( ace_yyconst ACE_TCHAR *ace_yy_str )
+ #else
+ ACE_YY_BUFFER_STATE ace_yy_scan_string( ace_yy_str )
+-ace_yyconst char *ace_yy_str;
++ace_yyconst ACE_TCHAR *ace_yy_str;
+ #endif
+ 	{
+ 	int len;
+@@ -1608,23 +1618,23 @@
+ 
+ #ifndef ACE_YY_NO_SCAN_BYTES
+ #ifdef ACE_YY_USE_PROTOS
+-ACE_YY_BUFFER_STATE ace_yy_scan_bytes( ace_yyconst char *bytes, int len )
++ACE_YY_BUFFER_STATE ace_yy_scan_bytes( ace_yyconst ACE_TCHAR *bytes, int len )
+ #else
+ ACE_YY_BUFFER_STATE ace_yy_scan_bytes( bytes, len )
+-ace_yyconst char *bytes;
++ace_yyconst ACE_TCHAR *bytes;
+ int len;
+ #endif
+ 	{
+ 	ACE_YY_BUFFER_STATE b;
+-	char *buf;
++	ACE_TCHAR *buf;
+ 	ace_yy_size_t n;
+ 	int i;
+ 
+ 	/* Get memory for full buffer, including space for trailing EOB's. */
+ 	n = len + 2;
+-	buf = (char *) ace_yy_flex_alloc( n );
++	buf = (ACE_TCHAR *) ace_yy_flex_alloc( n * sizeof (ACE_TCHAR) );
+ 	if ( ! buf )
+-		ACE_YY_FATAL_ERROR( "out of dynamic memory in ace_yy_scan_bytes()" );
++		ACE_YY_FATAL_ERROR (ACE_LIB_TEXT ("out of dynamic memory in ace_yy_scan_bytes()"));
+ 
+ 	for ( i = 0; i < len; ++i )
+ 		buf[i] = bytes[i];
+@@ -1633,7 +1643,7 @@
+ 
+ 	b = ace_yy_scan_buffer( buf, n );
+ 	if ( ! b )
+-		ACE_YY_FATAL_ERROR( "bad buffer in ace_yy_scan_bytes()" );
++		ACE_YY_FATAL_ERROR (ACE_LIB_TEXT ("bad buffer in ace_yy_scan_bytes()"));
+ 
+ 	/* It's okay to grow etc. this buffer, and we should throw it
+ 	 * away when we're done.
+@@ -1669,7 +1679,7 @@
+ 
+ 		if ( ! ace_yy_start_stack )
+ 			ACE_YY_FATAL_ERROR(
+-			"out of memory expanding start-condition stack" );
++			ACE_LIB_TEXT ("out of memory expanding start-condition stack"));
+ 		}
+ 
+ 	ace_yy_start_stack[ace_yy_start_stack_ptr++] = ACE_YY_START;
+@@ -1683,7 +1693,7 @@
+ static void ace_yy_pop_state()
+ 	{
+ 	if ( --ace_yy_start_stack_ptr < 0 )
+-		ACE_YY_FATAL_ERROR( "start-condition stack underflow" );
++		ACE_YY_FATAL_ERROR (ACE_LIB_TEXT ("start-condition stack underflow"));
+ 
+ 	BEGIN(ace_yy_start_stack[ace_yy_start_stack_ptr]);
+ 	}
+@@ -1702,13 +1712,13 @@
+ #endif
+ 
+ #ifdef ACE_YY_USE_PROTOS
+-static void ace_yy_fatal_error( ace_yyconst char msg[] )
++static void ace_yy_fatal_error( ace_yyconst ACE_TCHAR msg[] )
+ #else
+ static void ace_yy_fatal_error( msg )
+-char msg[];
++ACE_TCHAR msg[];
+ #endif
+ 	{
+-	(void) fprintf( stderr, "%s\n", msg );
++	(void) ACE_OS::fprintf( stderr, ACE_LIB_TEXT ("%s\n"), msg );
+ 	exit( ACE_YY_EXIT_FAILURE );
+ 	}
+ 
+@@ -1734,11 +1744,11 @@
+ 
+ #ifndef ace_yytext_ptr
+ #ifdef ACE_YY_USE_PROTOS
+-static void ace_yy_flex_strncpy( char *s1, ace_yyconst char *s2, int n )
++static void ace_yy_flex_strncpy( ACE_TCHAR *s1, ace_yyconst ACE_TCHAR *s2, int n )
+ #else
+ static void ace_yy_flex_strncpy( s1, s2, n )
+-char *s1;
+-ace_yyconst char *s2;
++ACE_TCHAR *s1;
++ace_yyconst ACE_TCHAR *s2;
+ int n;
+ #endif
+ 	{
+@@ -1750,10 +1760,10 @@
+ 
+ #ifdef ACE_YY_NEED_STRLEN
+ #ifdef ACE_YY_USE_PROTOS
+-static int ace_yy_flex_strlen( ace_yyconst char *s )
++static int ace_yy_flex_strlen( ace_yyconst ACE_TCHAR *s )
+ #else
+ static int ace_yy_flex_strlen( s )
+-ace_yyconst char *s;
++ace_yyconst ACE_TCHAR *s;
+ #endif
+ 	{
+ 	register int n;