integrate changes#2978,2979 from mainline

[perl5.git] / patchlevel.h

diff --git a/patchlevel.h b/patchlevel.h
index aad5161..8643ac0 100644 (file)
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -1,6 +1,7 @@
 #ifndef __PATCHLEVEL_H_INCLUDED__
-#define PATCHLEVEL 4
-#define SUBVERSION 61
+#define PATCHLEVEL 5
+#undef SUBVERSION     /* OS/390 has a SUBVERSION in a system header */
+#define SUBVERSION 3
 
 /*
        local_patches -- list of locally applied less-than-subversion patches.
@@ -39,6 +40,7 @@
  */
 static char    *local_patches[] = {
        NULL
+       ,"MAINT_TRIAL_5 - 5.005_03 maintenance trial 5"
        ,NULL
 };
 
@@ -46,5 +48,5 @@ static        char    *local_patches[] = {
 #  define      LOCAL_PATCH_COUNT       \
        (sizeof(local_patches)/sizeof(local_patches[0])-2)
 
-#define __PATCHLEVEL_H_INCLUDED__
+#  define __PATCHLEVEL_H_INCLUDED__
 #endif