PERL_FS_VER_FMT is only used with the current perl version, which is known at

compile time, so replace it with PERL_FS_VERSION, a compile time constant.

1 files changed, 10 insertions, 2 deletions

diff --git a/perl.h b/perl.h
index 982db702cf..d556b49219 100644
--- a/perl.h
+++ b/perl.h
@@ -3060,10 +3060,18 @@ typedef pthread_key_t	perl_key;
 #  define MEMBER_TO_FPTR(name)		name
 #endif
 
+#ifndef PERL_CORE
 /* format to use for version numbers in file/directory names */
 /* XXX move to Configure? */
-#ifndef PERL_FS_VER_FMT
-#  define PERL_FS_VER_FMT	"%d.%d.%d"
+/* This was only ever used for the current version, and that can be done at
+   compile time, as PERL_FS_VERSION, so should we just delete it?  */
+#  ifndef PERL_FS_VER_FMT
+#    define PERL_FS_VER_FMT	"%d.%d.%d"
+#  endif
+#endif
+
+#ifndef PERL_FS_VERSION
+#  define PERL_FS_VERSION	PERL_VERSION_STRING
 #endif
 
 /* This defines a way to flush all output buffers.  This may be a