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

diff --git a/patchlevel.h b/patchlevel.h
index f2c6b12..02a9689 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -1,13 +1,14 @@
 #ifndef __PATCHLEVEL_H_INCLUDED__
 
-#  define PERL_REVISION		5		/* age */
-#  define PERL_VERSION		5		/* epoch */
-#  define PERL_SUBVERSION	55		/* generation */
+/* do not adjust the whitespace! Configure expects the numbers to be
+ * exactly on the third column */
 
-/* these are the old terms of reference */
-#  define PATCHLEVEL		PERL_VERSION
-#  undef  SUBVERSION		/* OS/390 has a SUBVERSION in a system header */
-#  define SUBVERSION		PERL_SUBVERSION
+#define PERL_REVISION	5		/* age */
+#define PERL_VERSION	5		/* epoch */
+#define PERL_SUBVERSION	61		/* generation */
+
+#define __PATCHLEVEL_H_INCLUDED__
+#endif
 
 /*
 	local_patches -- list of locally applied less-than-subversion patches.
@@ -44,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
@@ -53,5 +55,8 @@ static	char	*local_patches[] = {
 #  define	LOCAL_PATCH_COUNT	\
 	(sizeof(local_patches)/sizeof(local_patches[0])-2)
 
-#  define __PATCHLEVEL_H_INCLUDED__
+/* the old terms of reference, add them only when explicitly included */
+#define PATCHLEVEL		PERL_VERSION
+#undef  SUBVERSION		/* OS/390 has a SUBVERSION in a system header */
+#define SUBVERSION		PERL_SUBVERSION
 #endif