X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=patchlevel.h;h=a17a6e679dd88122ac0bc896585343865d3db478;hb=46807d8e809cc127621bf85d9e9cea2f838eb477;hp=fa032d1ba3e98ddcdea92c81867b71c68bc75457;hpb=22c23f215652b63398ec01179deb2455df58e7d2;p=p5sagit%2Fp5-mst-13.2.git diff --git a/patchlevel.h b/patchlevel.h index fa032d1..a17a6e6 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -14,7 +14,7 @@ * exactly on the third column */ #define PERL_REVISION 5 /* age */ -#define PERL_VERSION 10 /* epoch */ +#define PERL_VERSION 11 /* epoch */ #define PERL_SUBVERSION 0 /* generation */ /* The following numbers describe the earliest compatible version of @@ -31,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 10 /* 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 @@ -116,9 +116,21 @@ hunk. */ #if !defined(PERL_PATCHLEVEL_H_IMPLICIT) && !defined(LOCAL_PATCH_COUNT) +#include "unpushed.h" +#if !defined(PERL_GIT_UNPUSHED_COMMITS) +#define PERL_GIT_UNPUSHED_COMMITS_PATCH /* no-op */ +#else +#define PERL_GIT_UNPUSHED_COMMITS_PATCH PERL_GIT_UNPUSHED_COMMITS +#endif +#if !defined(PERL_GIT_UNCOMMITTED_CHANGES) +#define PERL_GIT_UNCOMMITTED_CHANGES_PATCH /*no op*/ +#else +#define PERL_GIT_UNCOMMITTED_CHANGES_PATCH , STRINGIFY(PERL_GIT_UNCOMMITTED_CHANGES) +#endif static const char * const local_patches[] = { NULL - ,"RC2" + PERL_GIT_UNPUSHED_COMMITS_PATCH /* do not remove this line */ + PERL_GIT_UNCOMMITTED_CHANGES_PATCH /* do not remove this line */ ,NULL };