Rename the PRIElfbl, PRIX64, etc, to be PRIEUfldbl, PRIXU64,

so that case-ignoring systems like DCL can tell them from
PRIefldbl and PRIx64.  Apply Merijn's ccversion patches.

p4raw-id: //depot/perl@6982

3 files changed, 24 insertions, 0 deletions

diff --git a/vos/config.def b/vos/config.def
index 9f439a58e0..cdb8f814f4 100644
--- a/vos/config.def
+++ b/vos/config.def
@@ -167,8 +167,12 @@ $d_pause='define'
 $d_phostname='undef'
 $d_pipe='define'
 $d_poll='define'
+$d_PRIeldbl='define'
 $d_PRIfldbl='define'
 $d_PRIgldbl='define'
+$d_PRIEUldbl='define'
+$d_PRIFUldbl='define'
+$d_PRIGUldbl='define'
 $d_pthread_yield='undef'
 $d_pwage='undef'
 $d_pwchange='undef'
diff --git a/vos/config.h b/vos/config.h
index ecb8ae40d2..9454c79215 100644
--- a/vos/config.h
+++ b/vos/config.h
@@ -2524,8 +2524,18 @@
  *	This symbol, if defined, contains the string used by stdio to
  *	format long doubles (format 'g') for output.
  */
+/* PERL_PRIeldbl:
+ *	This symbol, if defined, contains the string used by stdio to
+ *	format long doubles (format 'e') for output.
+ */
+/* PERL_SCNfldbl:
+ *	This symbol, if defined, contains the string used by stdio to
+ *	format long doubles (format 'f') for input.
+ */
 #define PERL_PRIfldbl	"Lf"	/**/
 #define PERL_PRIgldbl	"Lg"	/**/
+#define PERL_PRIeldbl	$sPRIeldbl	/**/
+# PERL_SCNfldbl	$sSCNfldbl	/**/
 
 /* Off_t:
  *	This symbol holds the type used to declare offsets in the kernel.
diff --git a/vos/config_h.SH_orig b/vos/config_h.SH_orig
index a9bb0ea163..7c70ab3bf7 100755
--- a/vos/config_h.SH_orig
+++ b/vos/config_h.SH_orig
@@ -2548,8 +2548,18 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  *	This symbol, if defined, contains the string used by stdio to
  *	format long doubles (format 'g') for output.
  */
+/* PERL_PRIeldbl:
+ *	This symbol, if defined, contains the string used by stdio to
+ *	format long doubles (format 'e') for output.
+ */
+/* PERL_SCNfldbl:
+ *	This symbol, if defined, contains the string used by stdio to
+ *	format long doubles (format 'f') for input.
+ */
 #$d_PRIfldbl PERL_PRIfldbl	$sPRIfldbl	/**/
 #$d_PRIgldbl PERL_PRIgldbl	$sPRIgldbl	/**/
+#$d_PRIeldbl PERL_PRIeldbl	$sPRIeldbl	/**/
+#$d_SCNfldbl PERL_SCNfldbl	$sSCNfldbl	/**/
 
 /* Off_t:
  *	This symbol holds the type used to declare offsets in the kernel.