*** empty log message ***

2 files changed, 113 insertions, 113 deletions

diff --git a/etc/Svc_Conf_l.cpp.diff b/etc/Svc_Conf_l.cpp.diff
index 61559490d3a..226b606d1cc 100644
--- a/etc/Svc_Conf_l.cpp.diff
+++ b/etc/Svc_Conf_l.cpp.diff
@@ -31,26 +31,26 @@
  static int ace_yy_did_buffer_switch_on_eof;
  
 +#if 0
- static void ace_yyunput YY_PROTO(( int c, char *buf_ptr ));
+ static void ace_yyunput ACE_YY_PROTO(( int c, char *buf_ptr ));
 +#endif /* 0 */
- void ace_yyrestart YY_PROTO(( FILE *input_file ));
- void ace_yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
- void ace_yy_load_buffer_state YY_PROTO(( void ));
+ void ace_yyrestart ACE_YY_PROTO(( FILE *input_file ));
+ void ace_yy_switch_to_buffer ACE_YY_PROTO(( ACE_YY_BUFFER_STATE new_buffer ));
+ void ace_yy_load_buffer_state ACE_YY_PROTO(( void ));
 @@ -224,12 +231,14 @@
- void ace_yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
- void ace_yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
+ void ace_yy_delete_buffer ACE_YY_PROTO(( ACE_YY_BUFFER_STATE b ));
+ void ace_yy_init_buffer ACE_YY_PROTO(( ACE_YY_BUFFER_STATE b, FILE *file ));
  
 +#if 0
  static int ace_yy_start_stack_ptr = 0;
  static int ace_yy_start_stack_depth = 0;
  static int *ace_yy_start_stack = 0;
- static void ace_yy_push_state YY_PROTO(( int new_state ));
- static void ace_yy_pop_state YY_PROTO(( void ));
- static int ace_yy_top_state YY_PROTO(( void ));
+ static void ace_yy_push_state ACE_YY_PROTO(( int new_state ));
+ static void ace_yy_pop_state ACE_YY_PROTO(( void ));
+ static int ace_yy_top_state ACE_YY_PROTO(( void ));
 +#endif /* 0 */
  
- static void *ace_yy_flex_alloc YY_PROTO(( unsigned int ));
- static void *ace_yy_flex_realloc YY_PROTO(( void *, unsigned int ));
+ static void *ace_yy_flex_alloc ACE_YY_PROTO(( unsigned int ));
+ static void *ace_yy_flex_realloc ACE_YY_PROTO(( void *, unsigned int ));
 @@ -466,7 +475,7 @@
  #include "ace/Svc_Conf.h"
  #include "ace/Svc_Conf_Tokens.h"
@@ -61,109 +61,109 @@
  
  // Keeps track of the number of errors encountered so far.
 @@ -661,112 +670,112 @@
- YY_USER_ACTION
+ ACE_YY_USER_ACTION
  # line 35 "Svc_Conf.l"
  { return token (ACE_DYNAMIC); }
--	YY_BREAK
-+	/* YY_BREAK */
+-	ACE_YY_BREAK
++	/* ACE_YY_BREAK */
  case 3:
- YY_USER_ACTION
+ ACE_YY_USER_ACTION
  # line 36 "Svc_Conf.l"
  { return token (ACE_STATIC); }
--	YY_BREAK
-+	/* YY_BREAK */
+-	ACE_YY_BREAK
++	/* ACE_YY_BREAK */
  case 4:
- YY_USER_ACTION
+ ACE_YY_USER_ACTION
  # line 37 "Svc_Conf.l"
  { return token (ACE_SUSPEND); }
--	YY_BREAK
-+	/* YY_BREAK */
+-	ACE_YY_BREAK
++	/* ACE_YY_BREAK */
  case 5:
- YY_USER_ACTION
+ ACE_YY_USER_ACTION
  # line 38 "Svc_Conf.l"
  { return token (ACE_RESUME); }
--	YY_BREAK
-+	/* YY_BREAK */
+-	ACE_YY_BREAK
++	/* ACE_YY_BREAK */
  case 6:
- YY_USER_ACTION
+ ACE_YY_USER_ACTION
  # line 39 "Svc_Conf.l"
  { return token (ACE_REMOVE); }
--	YY_BREAK
-+	/* YY_BREAK */
+-	ACE_YY_BREAK
++	/* ACE_YY_BREAK */
  case 7:
- YY_USER_ACTION
+ ACE_YY_USER_ACTION
  # line 40 "Svc_Conf.l"
  { return token (ACE_USTREAM); }
--	YY_BREAK
-+	/* YY_BREAK */
+-	ACE_YY_BREAK
++	/* ACE_YY_BREAK */
  case 8:
- YY_USER_ACTION
+ ACE_YY_USER_ACTION
  # line 41 "Svc_Conf.l"
  { return token (ACE_MODULE_T); }
--	YY_BREAK
-+	/* YY_BREAK */
+-	ACE_YY_BREAK
++	/* ACE_YY_BREAK */
  case 9:
- YY_USER_ACTION
+ ACE_YY_USER_ACTION
  # line 42 "Svc_Conf.l"
  { return token (ACE_SVC_OBJ_T); }
--	YY_BREAK
-+	/* YY_BREAK */
+-	ACE_YY_BREAK
++	/* ACE_YY_BREAK */
  case 10:
- YY_USER_ACTION
+ ACE_YY_USER_ACTION
  # line 43 "Svc_Conf.l"
  { return token (ACE_STREAM_T); }
--	YY_BREAK
-+	/* YY_BREAK */
+-	ACE_YY_BREAK
++	/* ACE_YY_BREAK */
  case 11:
- YY_USER_ACTION
+ ACE_YY_USER_ACTION
  # line 44 "Svc_Conf.l"
  { return token (ACE_ACTIVE); }
--	YY_BREAK
-+	/* YY_BREAK */
+-	ACE_YY_BREAK
++	/* ACE_YY_BREAK */
  case 12:
- YY_USER_ACTION
+ ACE_YY_USER_ACTION
  # line 45 "Svc_Conf.l"
  { return token (ACE_INACTIVE); }
--	YY_BREAK
-+	/* YY_BREAK */
+-	ACE_YY_BREAK
++	/* ACE_YY_BREAK */
  case 13:
- YY_USER_ACTION
+ ACE_YY_USER_ACTION
  # line 46 "Svc_Conf.l"
  { return token (ACE_COLON); }
--	YY_BREAK
-+	/* YY_BREAK */
+-	ACE_YY_BREAK
++	/* ACE_YY_BREAK */
  case 14:
- YY_USER_ACTION
+ ACE_YY_USER_ACTION
  # line 47 "Svc_Conf.l"
  { return token (ACE_STAR); }
--	YY_BREAK
-+	/* YY_BREAK */
+-	ACE_YY_BREAK
++	/* ACE_YY_BREAK */
  case 15:
- YY_USER_ACTION
+ ACE_YY_USER_ACTION
  # line 48 "Svc_Conf.l"
  { return token (ACE_LPAREN); }
--	YY_BREAK
-+	/* YY_BREAK */
+-	ACE_YY_BREAK
++	/* ACE_YY_BREAK */
  case 16:
- YY_USER_ACTION
+ ACE_YY_USER_ACTION
  # line 49 "Svc_Conf.l"
  { return token (ACE_RPAREN); }
--	YY_BREAK
-+	/* YY_BREAK */
+-	ACE_YY_BREAK
++	/* ACE_YY_BREAK */
  case 17:
- YY_USER_ACTION
+ ACE_YY_USER_ACTION
  # line 50 "Svc_Conf.l"
  { return token (ACE_LBRACE); }
--	YY_BREAK
-+	/* YY_BREAK */
+-	ACE_YY_BREAK
++	/* ACE_YY_BREAK */
  case 18:
- YY_USER_ACTION
+ ACE_YY_USER_ACTION
  # line 51 "Svc_Conf.l"
  { return token (ACE_RBRACE); }
--	YY_BREAK
-+	/* YY_BREAK */
+-	ACE_YY_BREAK
++	/* ACE_YY_BREAK */
  case 19:
- YY_USER_ACTION
+ ACE_YY_USER_ACTION
  # line 52 "Svc_Conf.l"
  { // Eliminate the opening and closing double quotes
  		        *strrchr (ace_yytext, '"') = '\0';
@@ -171,10 +171,10 @@
 -                        ace_yylval.ident_ = ace_obstack->copy (ace_yytext + 1, ace_yyleng); 
 +                        ace_yylval.ident_ = ace_obstack->copy (ace_yytext + 1, ace_yyleng);
  			return token (ACE_STRING); }
--	YY_BREAK
-+	/* YY_BREAK */
+-	ACE_YY_BREAK
++	/* ACE_YY_BREAK */
  case 20:
- YY_USER_ACTION
+ ACE_YY_USER_ACTION
  # line 57 "Svc_Conf.l"
 -{ 
 -		        ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng); 
@@ -183,10 +183,10 @@
 +		        ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng);
 +			return token (ACE_IDENT);
  		      }
--	YY_BREAK
-+	/* YY_BREAK */
+-	ACE_YY_BREAK
++	/* ACE_YY_BREAK */
  case 21:
- YY_USER_ACTION
+ ACE_YY_USER_ACTION
  # line 61 "Svc_Conf.l"
 -{ 
 -		        ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng); 
@@ -195,31 +195,31 @@
 +		        ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng);
 +			return token (ACE_PATHNAME);
  		      }
--	YY_BREAK
-+	/* YY_BREAK */
+-	ACE_YY_BREAK
++	/* ACE_YY_BREAK */
  case 22:
- YY_USER_ACTION
+ ACE_YY_USER_ACTION
  # line 65 "Svc_Conf.l"
 @@ -787,7 +796,7 @@
- case YY_STATE_EOF(NORMAL):
+ case ACE_YY_STATE_EOF(NORMAL):
  # line 68 "Svc_Conf.l"
- { YY_NEW_FILE; ace_yyterminate(); }
--	YY_BREAK
-+	/* YY_BREAK */
+ { ACE_YY_NEW_FILE; ace_yyterminate(); }
+-	ACE_YY_BREAK
++	/* ACE_YY_BREAK */
  case 25:
- YY_USER_ACTION
+ ACE_YY_USER_ACTION
  # line 69 "Svc_Conf.l"
 @@ -1120,6 +1129,7 @@
  	}
  
  
 +#if 0
- #ifdef YY_USE_PROTOS
+ #ifdef ACE_YY_USE_PROTOS
  static void ace_yyunput( int c, register char *ace_yy_bp )
  #else
 @@ -1164,7 +1174,7 @@
  	 */
- 	YY_DO_BEFORE_ACTION; /* set up ace_yytext again */
+ 	ACE_YY_DO_BEFORE_ACTION; /* set up ace_yytext again */
  	}
 -
 +#endif /* 0 */
@@ -231,7 +231,7 @@
  
  
 +#if 0
- #ifdef YY_USE_PROTOS
+ #ifdef ACE_YY_USE_PROTOS
  static void ace_yy_push_state( int new_state )
  #else
 @@ -1417,7 +1428,7 @@
@@ -241,7 +241,7 @@
 -
 +#endif /* 0 */
  
- #ifdef YY_USE_PROTOS
+ #ifdef ACE_YY_USE_PROTOS
  static void ace_yy_fatal_error( const char msg[] )
 @@ -1504,6 +1515,6 @@
  {
diff --git a/etc/Svc_Conf_y.cpp.diff b/etc/Svc_Conf_y.cpp.diff
index ab3e0c5ed36..91cc08ebc50 100644
--- a/etc/Svc_Conf_y.cpp.diff
+++ b/etc/Svc_Conf_y.cpp.diff
@@ -1,65 +1,65 @@
 --- Svc_Conf_y.cpp.orig	Mon Feb 23 09:14:42 1998
 +++ Svc_Conf_y.cpp	Mon Feb 23 09:24:51 1998
 @@ -395,7 +397,7 @@
- #endif /* YYDEBUG_INDENT */
- #ifndef YYDEBUG_REDUCE
+ #endif /* ACE_YYDEBUG_INDENT */
+ #ifndef ACE_YYDEBUG_REDUCE
  #ifdef __cplusplus
--void YYDEBUG_REDUCE(int ace_yynew_state, int ace_yyrule_num, char *ace_yyrule_string, int ace_yynew_indent, int ace_yyrhs_count)
-+void YYDEBUG_REDUCE(int /* ace_yynew_state */, int /* ace_yyrule_num */, char *ace_yyrule_string, int ace_yynew_indent, int ace_yyrhs_count)
+-void ACE_YYDEBUG_REDUCE(int ace_yynew_state, int ace_yyrule_num, char *ace_yyrule_string, int ace_yynew_indent, int ace_yyrhs_count)
++void ACE_YYDEBUG_REDUCE(int /* ace_yynew_state */, int /* ace_yyrule_num */, char *ace_yyrule_string, int ace_yynew_indent, int ace_yyrhs_count)
  #else
- YYDEBUG_REDUCE(ace_yynew_state, ace_yyrule_num, ace_yyrule_string, ace_yynew_indent, ace_yyrhs_count)
+ ACE_YYDEBUG_REDUCE(ace_yynew_state, ace_yyrule_num, ace_yyrule_string, ace_yynew_indent, ace_yyrhs_count)
  int ace_yynew_state;
 @@ -425,7 +427,7 @@
- #endif /* YYDEBUG_REDUCE */
- #ifndef YYDEBUG_SHIFT_LEXEME
+ #endif /* ACE_YYDEBUG_REDUCE */
+ #ifndef ACE_YYDEBUG_SHIFT_LEXEME
  #ifdef __cplusplus
--void YYDEBUG_SHIFT_LEXEME(int ace_yyold_state, int ace_yynew_state, char *ace_yytoken_string, int ace_yynew_indent)
-+void YYDEBUG_SHIFT_LEXEME(int /* ace_yyold_state */, int /* ace_yynew_state */, char *ace_yytoken_string, int ace_yynew_indent)
+-void ACE_YYDEBUG_SHIFT_LEXEME(int ace_yyold_state, int ace_yynew_state, char *ace_yytoken_string, int ace_yynew_indent)
++void ACE_YYDEBUG_SHIFT_LEXEME(int /* ace_yyold_state */, int /* ace_yynew_state */, char *ace_yytoken_string, int ace_yynew_indent)
  #else
- YYDEBUG_SHIFT_LEXEME(ace_yyold_state, ace_yynew_state, ace_yytoken_string, ace_yynew_indent)
+ ACE_YYDEBUG_SHIFT_LEXEME(ace_yyold_state, ace_yynew_state, ace_yytoken_string, ace_yynew_indent)
  int ace_yyold_state;
 @@ -440,7 +442,7 @@
- #endif /*  YYDEBUG_SHIFT_LEXEME */
- #ifndef YYDEBUG_LOOK_AHEAD
+ #endif /*  ACE_YYDEBUG_SHIFT_LEXEME */
+ #ifndef ACE_YYDEBUG_LOOK_AHEAD
  #ifdef __cplusplus
--void YYDEBUG_LOOK_AHEAD(int ace_yynew_state, int ace_yytoken_num, char *ace_yytoken_string, int ace_yyindent)
-+void YYDEBUG_LOOK_AHEAD(int /* ace_yynew_state */, int ace_yytoken_num, char *ace_yytoken_string, int ace_yyindent)
+-void ACE_YYDEBUG_LOOK_AHEAD(int ace_yynew_state, int ace_yytoken_num, char *ace_yytoken_string, int ace_yyindent)
++void ACE_YYDEBUG_LOOK_AHEAD(int /* ace_yynew_state */, int ace_yytoken_num, char *ace_yytoken_string, int ace_yyindent)
  #else
- YYDEBUG_LOOK_AHEAD(ace_yynew_state, ace_yytoken_num, ace_yytoken_string, ace_yyindent)
+ ACE_YYDEBUG_LOOK_AHEAD(ace_yynew_state, ace_yytoken_num, ace_yytoken_string, ace_yyindent)
  int ace_yynew_state;
 @@ -457,7 +459,7 @@
- #endif /* YYDEBUG_LOOK_AHEAD */
- #ifndef YYDEBUG_DISCARD_STATE
+ #endif /* ACE_YYDEBUG_LOOK_AHEAD */
+ #ifndef ACE_YYDEBUG_DISCARD_STATE
  #ifdef __cplusplus
--void YYDEBUG_DISCARD_STATE(int ace_yynew_state, int ace_yyindent)
-+void YYDEBUG_DISCARD_STATE(int /* ace_yynew_state */, int ace_yyindent)
+-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
- YYDEBUG_DISCARD_STATE(ace_yynew_state, ace_yyindent)
+ ACE_YYDEBUG_DISCARD_STATE(ace_yynew_state, ace_yyindent)
  int ace_yynew_state;
 @@ -485,7 +487,7 @@
- #endif /* YYDEBUG_DISCARD_STATE */
- #ifndef YYDEBUG_DISCARD_TOKEN
+ #endif /* ACE_YYDEBUG_DISCARD_STATE */
+ #ifndef ACE_YYDEBUG_DISCARD_TOKEN
  #ifdef __cplusplus
--void YYDEBUG_DISCARD_TOKEN(int ace_yynew_state, int ace_yytoken_num, char *ace_yytoken_string, int ace_yyindent)
-+void YYDEBUG_DISCARD_TOKEN(int /* ace_yynew_state */, int /* ace_yytoken_num */, char *ace_yytoken_string, int ace_yyindent)
+-void ACE_YYDEBUG_DISCARD_TOKEN(int ace_yynew_state, int ace_yytoken_num, char *ace_yytoken_string, int ace_yyindent)
++void ACE_YYDEBUG_DISCARD_TOKEN(int /* ace_yynew_state */, int /* ace_yytoken_num */, char *ace_yytoken_string, int ace_yyindent)
  #else
- YYDEBUG_DISCARD_TOKEN(ace_yynew_state, ace_yytoken_num, ace_yytoken_string, ace_yyindent)
+ ACE_YYDEBUG_DISCARD_TOKEN(ace_yynew_state, ace_yytoken_num, ace_yytoken_string, ace_yyindent)
  int ace_yynew_state;
 @@ -500,7 +502,7 @@
- #endif /* YYDEBUG_DISCARD_TOKEN */
- #ifndef YYDEBUG_SHIFT_ERROR_LEXEME
+ #endif /* ACE_YYDEBUG_DISCARD_TOKEN */
+ #ifndef ACE_YYDEBUG_SHIFT_ERROR_LEXEME
  #ifdef __cplusplus
--void YYDEBUG_SHIFT_ERROR_LEXEME(int ace_yyold_state, int ace_yynew_state, int ace_yyindent)
-+void 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)
++void ACE_YYDEBUG_SHIFT_ERROR_LEXEME(int /* ace_yyold_state */, int /* ace_yynew_state */, int ace_yyindent)
  #else
- YYDEBUG_SHIFT_ERROR_LEXEME(ace_yyold_state, ace_yynew_state, ace_yyindent)
+ ACE_YYDEBUG_SHIFT_ERROR_LEXEME(ace_yyold_state, ace_yynew_state, ace_yyindent)
  int ace_yyold_state;
 @@ -526,7 +528,7 @@
      extern char *ace_foo();
  #endif
  
--    if (ace_yys = ACE_OS::getenv("YYDEBUG"))
-+    if ((ace_yys = ACE_OS::getenv("YYDEBUG")))
+-    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')