X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=patchlevel.h;h=391cb4126c5740b7d305fc9b03cf19f3bf2fb94c;hb=d1f3479f8c62266471eafb582091197ae2cf4cad;hp=526659a0d88d7defe30280e27aeeea6bcb4ee5a7;hpb=f7047380cf724d6ba2d3de39f9bed88ffab64608;p=p5sagit%2Fp5-mst-13.2.git diff --git a/patchlevel.h b/patchlevel.h index 526659a..391cb41 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -1,6 +1,7 @@ /* patchlevel.h * - * Copyright (c) 1997-2002, Larry Wall + * Copyright (C) 1993, 1995, 1996, 1997, 1998, 1999, 2000, 2001, + * 2002, 2003, 2004, 2005, 2006, 2007, by Larry Wall and others * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -13,7 +14,7 @@ * exactly on the third column */ #define PERL_REVISION 5 /* age */ -#define PERL_VERSION 9 /* epoch */ +#define PERL_VERSION 11 /* epoch */ #define PERL_SUBVERSION 0 /* generation */ /* The following numbers describe the earliest compatible version of @@ -30,7 +31,7 @@ to include in @INC. See INSTALL for how this works. */ #define PERL_API_REVISION 5 /* Adjust manually as needed. */ -#define PERL_API_VERSION 8 /* Adjust manually as needed. */ +#define PERL_API_VERSION 11 /* Adjust manually as needed. */ #define PERL_API_SUBVERSION 0 /* Adjust manually as needed. */ /* XXX Note: The selection of non-default Configure options, such @@ -50,9 +51,11 @@ please place your applied patch line after its dependencies. This will help tracking of patch dependencies. - Please edit the hunk of diff which adds your patch to this list, - to remove context lines which would give patch problems. For instance, - if the original context diff is + Please either use 'diff --unified=0' if your diff supports + that or edit the hunk of the diff output which adds your patch + to this list, to remove context lines which would give patch + problems. For instance, if the original context diff is + *** patchlevel.h.orig --- patchlevel.h *** 38,43 *** @@ -70,6 +73,7 @@ *** 41,43 *** --- 41,44 --- + ,"MINE001 - my new patch" + ,NULL }; (Note changes to line numbers as well as removal of context lines.) @@ -94,8 +98,9 @@ while () { $seen++ if /local_patches\[\]/; print PLOUT; } -close PLOUT or warn "Couldn't close filehandle writing to patchlevel.new : $!"; -close PLIN or warn "Couldn't close filehandle reading from patchlevel.h : $!"; +close PLOUT or die "Couldn't close filehandle writing to patchlevel.new : $!"; +close PLIN or die "Couldn't close filehandle reading from patchlevel.h : $!"; +close DATA; # needed to allow unlink to work win32. unlink "patchlevel.bak" or warn "Couldn't unlink patchlevel.bak : $!" if -e "patchlevel.bak"; rename "patchlevel.h", "patchlevel.bak" or @@ -104,27 +109,24 @@ rename "patchlevel.new", "patchlevel.h" or die "Couldn't rename patchlevel.new to patchlevel.h : $!"; __END__ -Please keep empty lines below so patching of this file doesn't -interfere with the following lines. +Please keep empty lines below so that context diffs of this file do +not ever collect the lines belonging to local_patches() into the same +hunk. */ - - - - - - #if !defined(PERL_PATCHLEVEL_H_IMPLICIT) && !defined(LOCAL_PATCH_COUNT) -static char *local_patches[] = { +static const char * const local_patches[] = { NULL - ,"DEVEL18374" + ,"DEVEL" ,NULL }; + + /* Initial space prevents this variable from being inserted in config.sh */ # define LOCAL_PATCH_COUNT \ - (sizeof(local_patches)/sizeof(local_patches[0])-2) + ((int)(sizeof(local_patches)/sizeof(local_patches[0])-2)) /* the old terms of reference, add them only when explicitly included */ #define PATCHLEVEL PERL_VERSION