X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=patchlevel.h;h=02a968910ee7806326d7f2518e1e0d05f2f87922;hb=664bb207f6bd57f05b66c9abec00898987f7060b;hp=a54f937efae8942f420597ceb5ba1de8d698f498;hpb=ba7a42cfc3153b8734c2e41cf47c68ed16c5d66a;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/patchlevel.h b/patchlevel.h
index a54f937..02a9689 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -5,7 +5,10 @@
 
 #define PERL_REVISION	5		/* age */
 #define PERL_VERSION	5		/* epoch */
-#define PERL_SUBVERSION	57		/* generation */
+#define PERL_SUBVERSION	61		/* generation */
+
+#define __PATCHLEVEL_H_INCLUDED__
+#endif
 
 /*
 	local_patches -- list of locally applied less-than-subversion patches.
@@ -42,6 +45,7 @@
 	This will prevent patch from choking if someone has previously
 	applied different patches than you.
  */
+#if !defined(PERL_PATCHLEVEL_H_IMPLICIT) && !defined(LOCAL_PATCH_COUNT)
 static	char	*local_patches[] = {
 	NULL
 	,NULL
@@ -51,13 +55,8 @@ static	char	*local_patches[] = {
 #  define	LOCAL_PATCH_COUNT	\
 	(sizeof(local_patches)/sizeof(local_patches[0])-2)
 
-#  define __PATCHLEVEL_H_INCLUDED__
-#endif
-
 /* the old terms of reference, add them only when explicitly included */
-#if !defined(PERL_PATCHLEVEL_H_IMPLICIT) && !defined(PATCHLEVEL)
 #define PATCHLEVEL		PERL_VERSION
 #undef  SUBVERSION		/* OS/390 has a SUBVERSION in a system header */
 #define SUBVERSION		PERL_SUBVERSION
 #endif
-