From 743348ea534b4995d9361eb736df9c5931bdd63a Mon Sep 17 00:00:00 2001 From: Roger Sayle Date: Sun, 21 Nov 2004 23:01:44 +0000 Subject: inclhack.def (alpha_pthread_init): Fix technical problems with the last check-in caused by CVS variable substitution. * inclhack.def (alpha_pthread_init): Fix technical problems with the last check-in caused by CVS variable substitution. * fixincl.x: Likewise. * tests/base/pthread.h: Likewise. From-SVN: r90989 --- fixincludes/ChangeLog | 7 +++++++ fixincludes/fixincl.x | 6 +++--- fixincludes/inclhack.def | 12 ++++++------ fixincludes/tests/base/pthread.h | 2 +- 4 files changed, 17 insertions(+), 10 deletions(-) (limited to 'fixincludes') diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index ace5d2a..25a4e7f 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,4 +1,11 @@ 2004-11-20 Roger Sayle + + * inclhack.def (alpha_pthread_init): Fix technical problems with + the last check-in caused by CVS variable substitution. + * fixincl.x: Likewise. + * tests/base/pthread.h: Likewise. + +2004-11-20 Roger Sayle Bruce Korb * inclhack.def (alpha_pthread_init): New fix. diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index ff77211..10466ce 100644 --- a/fixincludes/fixincl.x +++ b/fixincludes/fixincl.x @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed Sunday November 21, 2004 at 09:09:46 AM MST + * It has been AutoGen-ed Sunday November 21, 2004 at 03:52:23 PM MST * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT CVS-MERGE THIS FILE, EITHER Sun Nov 21 09:09:46 MST 2004 +/* DO NOT CVS-MERGE THIS FILE, EITHER Sun Nov 21 15:52:23 MST 2004 * * You must regenerate it. Use the ./genfixes script. * @@ -1106,7 +1106,7 @@ tSCC* apzAlpha_Pthread_InitMachs[] = { * content selection pattern - do fix if pattern found */ tSCC zAlpha_Pthread_InitSelect0[] = - " \\* @\\(#\\)\\$RCSfile: pthread\\.h,v \\$ \\$Revision: 1\\.1\\.33\\.21 \\$ \\(DEC\\) \\$Date: 2000/08/15 15:30:13 \\$"; + " \\* @\\(#\\).RCSfile: pthread\\.h,v \\$ .Revision: 1\\.1\\.33\\.21 \\$ \\(DEC\\) .Date: 2000/08/15 15:30:13 \\$"; #define ALPHA_PTHREAD_INIT_TEST_CT 1 static tTestDesc aAlpha_Pthread_InitTests[] = { diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index 37f2311..8c012f7 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -714,9 +714,9 @@ fix = { fix = { hackname = alpha_pthread_init; files = pthread.h; - select = ' \* @\(#\)\$' 'RCSfile: pthread\.h,v \$' - ' \$' 'Revision: 1\.1\.33\.21 \$ \(DEC\)' - ' \$' 'Date: 2000/08/15 15:30:13 \$'; + select = ' \* @\(#\).RCSfile: pthread\.h,v \$' + ' .Revision: 1\.1\.33\.21 \$ \(DEC\)' + ' .Date: 2000/08/15 15:30:13 \$'; mach = "alpha*-dec-osf*"; sed = "s@MVALID\\(.*\\)A}@MVALID\\1A, 0, 0, 0, 0, 0, 0 }@\n" "s@MVALID\\(.*\\)_}@MVALID\\1_, 0, 0, 0, 0 }@\n" @@ -725,9 +725,9 @@ fix = { "s@WVALID\\(.*\\)A}@WVALID\\1A, 0, 0, 0, 0, 0, 0, 0, 0, 0 }@\n" "s@WVALID\\(.*\\)_}@WVALID\\1_, 0, 0, 0, 0, 0, 0, 0 }@\n"; test_text = "/*\n" - " * @(#)\\$" "RCSfile: pthread.h,v \\$ \\$" - "Revision: 1.1.33.21 \\$ (DEC) \\$" - "Date: 2000/08/15 15:30:13 \\$\n" + " * @(#)_RCSfile: pthread.h,v \\$ " + "_Revision: 1.1.33.21 \\$ (DEC) " + "_Date: 2000/08/15 15:30:13 \\$\n" " */\n" "#ifndef _PTHREAD_NOMETER_STATIC\n" "# define PTHREAD_MUTEX_INITIALIZER \\\n" diff --git a/fixincludes/tests/base/pthread.h b/fixincludes/tests/base/pthread.h index 735c0ef..767c6e2 100644 --- a/fixincludes/tests/base/pthread.h +++ b/fixincludes/tests/base/pthread.h @@ -37,7 +37,7 @@ #if defined( ALPHA_PTHREAD_INIT_CHECK ) /* - * @(#)$RCSfile: pthread.h,v $ $Revision: 1.1.33.21 $ (DEC) $Date: 2000/08/15 15:30:13 $ + * @(#)_RCSfile: pthread.h,v $ _Revision: 1.1.33.21 $ (DEC) _Date: 2000/08/15 15:30:13 $ */ #ifndef _PTHREAD_NOMETER_STATIC # define PTHREAD_MUTEX_INITIALIZER {_PTHREAD_MSTATE_CONFIG, _PTHREAD_MVALID | _PTHREAD_MVF_STA, 0, 0, 0, 0, 0, 0 } -- cgit v1.1