Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Move PERL_VERSION_STRING from patchlevel.h to perl.h

(and revert a89d24b)
It's getting too complex to work around some versions of awk which don't want
to implement the regular expressions that they are documented to implement.
  • Loading branch information...
commit d94216564938cd42af43fa553fe0ab9651fe48c9 1 parent a89d24b
Nicholas Clark authored
Showing with 5 additions and 5 deletions.
  1. +1 −1  Configure
  2. +0 −4 patchlevel.h
  3. +4 −0 perl.h
View
2  Configure
@@ -23167,7 +23167,7 @@ $test -f UU/cmdline.opt && $cat UU/cmdline.opt >> config.sh
: add special variables
$test -f $src/patchlevel.h && \
-awk '/^#define[ ]+PERL_.*[^\\]$/ {printf "%s=%s\n",$2,$3}' $src/patchlevel.h >>config.sh
+awk '/^#define[ ]+PERL_/ {printf "%s=%s\n",$2,$3}' $src/patchlevel.h >>config.sh
echo "PERL_PATCHLEVEL='$perl_patchlevel'" >>config.sh
echo "PERL_CONFIG_SH=true" >>config.sh
View
4 patchlevel.h
@@ -17,10 +17,6 @@
#define PERL_VERSION 11 /* epoch */
#define PERL_SUBVERSION 0 /* generation */
-#define PERL_VERSION_STRING STRINGIFY(PERL_REVISION) "." \
- STRINGIFY(PERL_VERSION) "." \
- STRINGIFY(PERL_SUBVERSION)
-
/* The following numbers describe the earliest compatible version of
Perl ("compatibility" here being defined as sufficient binary/API
compatibility to run XS code built with the older version).
View
4 perl.h
@@ -4729,6 +4729,10 @@ typedef struct exitlistentry {
#include "patchlevel.h"
#undef PERL_PATCHLEVEL_H_IMPLICIT
+#define PERL_VERSION_STRING STRINGIFY(PERL_REVISION) "." \
+ STRINGIFY(PERL_VERSION) "." \
+ STRINGIFY(PERL_SUBVERSION)
+
#ifdef PERL_GLOBAL_STRUCT
struct perl_vars {
# include "perlvars.h"
Please sign in to comment.
Something went wrong with that request. Please try again.