updated etc/Svc_Conf_l.cpp.diff

2 files changed, 17 insertions, 21 deletions

diff --git a/etc/README b/etc/README
index a1327185477..bbbac8b0f4a 100644
--- a/etc/README
+++ b/etc/README
@@ -4,7 +4,7 @@ Svc_Conf_[ly].cpp.diff are use to patch their respective files in
 ACE_wrappers/ace.  They are used by Makefile in that directory, so
 users don't ordinarily need to be concerned with them.
 
-To updated Svc_Conf_l.cpp.diff:
+To update Svc_Conf_l.cpp.diff:
 
 1) cd to ACE_wrappers/ace.
 2) Create the old version of the file in Svc_Conf_l.cpp.orig.
diff --git a/etc/Svc_Conf_l.cpp.diff b/etc/Svc_Conf_l.cpp.diff
index 226b606d1cc..9022c5ffbba 100644
--- a/etc/Svc_Conf_l.cpp.diff
+++ b/etc/Svc_Conf_l.cpp.diff
@@ -1,22 +1,18 @@
---- Svc_Conf_l.cpp.orig	Thu Oct 30 21:08:12 1997
-+++ Svc_Conf_l.cpp	Thu Oct 30 21:09:58 1997
-@@ -1,3 +1,6 @@
-+// $Id$
+--- Svc_Conf_l.cpp.orig	Sun Apr 26 21:26:59 1998
++++ Svc_Conf_l.cpp	Sun Apr 26 21:31:02 1998
+@@ -1,7 +1,10 @@
++// $Id: Svc_Conf_l.cpp,v 4.18 1998/04/23 23:23:34 schmidt Exp $
 +
 +#define ACE_BUILD_DLL
- #include "ace/config.h"
- #if defined (ACE_HAS_TERM_IOCTLS) /* to avoid conflict with sys/termios.h ECHO */
- #undef ACE_HAS_TERM_IOCTLS
-@@ -8,7 +11,7 @@
  /* A lexical scanner generated by flex */
  
  /* Scanner skeleton version:
 - * $Header: /home/daffy/u0/vern/flex/flex-2.4.7/RCS/flex.skl,v 1.2 94/08/03 11:13:24 vern Exp $
-+ * $Header$
++ * Header: /home/daffy/u0/vern/flex/flex-2.4.7/RCS/flex.skl,v 1.2 94/08/03 11:13:24 vern Exp
   */
  
  #define FLEX_SCANNER
-@@ -141,7 +144,9 @@
+@@ -134,7 +137,9 @@
  		} \
  	while ( 0 )
  
@@ -26,7 +22,7 @@
  
  
  struct ace_yy_buffer_state
-@@ -216,7 +221,9 @@
+@@ -209,7 +214,9 @@
   */
  static int ace_yy_did_buffer_switch_on_eof;
  
@@ -36,7 +32,7 @@
  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 @@
+@@ -217,12 +224,14 @@
  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 ));
  
@@ -51,7 +47,7 @@
  
  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 @@
+@@ -487,7 +496,7 @@
  #include "ace/Svc_Conf.h"
  #include "ace/Svc_Conf_Tokens.h"
  
@@ -60,7 +56,7 @@
  int ace_yylineno = 1;
  
  // Keeps track of the number of errors encountered so far.
-@@ -661,112 +670,112 @@
+@@ -682,112 +691,112 @@
  ACE_YY_USER_ACTION
  # line 35 "Svc_Conf.l"
  { return token (ACE_DYNAMIC); }
@@ -200,7 +196,7 @@
  case 22:
  ACE_YY_USER_ACTION
  # line 65 "Svc_Conf.l"
-@@ -787,7 +796,7 @@
+@@ -808,7 +817,7 @@
  case ACE_YY_STATE_EOF(NORMAL):
  # line 68 "Svc_Conf.l"
  { ACE_YY_NEW_FILE; ace_yyterminate(); }
@@ -209,7 +205,7 @@
  case 25:
  ACE_YY_USER_ACTION
  # line 69 "Svc_Conf.l"
-@@ -1120,6 +1129,7 @@
+@@ -1141,6 +1150,7 @@
  	}
  
  
@@ -217,7 +213,7 @@
  #ifdef ACE_YY_USE_PROTOS
  static void ace_yyunput( int c, register char *ace_yy_bp )
  #else
-@@ -1164,7 +1174,7 @@
+@@ -1185,7 +1195,7 @@
  	 */
  	ACE_YY_DO_BEFORE_ACTION; /* set up ace_yytext again */
  	}
@@ -226,7 +222,7 @@
  
  #ifdef __cplusplus
  static int ace_yyinput()
-@@ -1372,6 +1382,7 @@
+@@ -1393,6 +1403,7 @@
  	}
  
  
@@ -234,7 +230,7 @@
  #ifdef ACE_YY_USE_PROTOS
  static void ace_yy_push_state( int new_state )
  #else
-@@ -1417,7 +1428,7 @@
+@@ -1438,7 +1449,7 @@
  	{
  	return ace_yy_start_stack[ace_yy_start_stack_ptr - 1];
  	}
@@ -243,7 +239,7 @@
  
  #ifdef ACE_YY_USE_PROTOS
  static void ace_yy_fatal_error( const char msg[] )
-@@ -1504,6 +1515,6 @@
+@@ -1525,6 +1536,6 @@
  {
    ::fflush (ace_yyin);
    ace_yytext[0] = '#';