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, 104 insertions, 43 deletions

diff --git a/Porting/Glossary b/Porting/Glossary
index c148f11956..be59c1616b 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -197,12 +197,24 @@ ccflags_uselargefiles (uselfs.U):
 	This variable contains the compiler flags needed by large file builds
 	and added to ccflags by hints files.
 
+ccname (Checkcc.U):
+	This can set either by hints files or by Configure.  If using
+	gcc, this is gcc, and if not, usually equal to cc, unimpressive, no?
+	Some platforms, however, make good use of this by storing the
+	flavor of the C compiler being used here.  For example if using
+	the Sun WorkShop suite, ccname will be 'workshop'.
+
 ccsymbols (Cppsym.U):
 	The variable contains the symbols defined by the C compiler alone.
 	The symbols defined by cpp or by cc when it calls cpp are not in
 	this list, see cppsymbols and cppccsymbols.
 	The list is a space-separated list of symbol=value tokens.
 
+ccversion (Checkcc.U):
+	This can set either by hints files or by Configure.  If using
+	a (non-gcc) vendor cc, this variable may contain a version for
+	the compiler.
+
 cf_by (cf_who.U):
 	Login name of the person who ran the Configure script and answered the
 	questions. This is used to tag both config.sh and config_h.SH.
@@ -1091,28 +1103,34 @@ d_PRId64 (quadfio.U):
 	indiciates that stdio has a symbol to print 64-bit decimal numbers.
 
 d_PRIeldbl (longdblfio.U):
-	This variable conditionally defines the PERL_PRIfldlbl symbol, which
+	This variable conditionally defines the PERL_PRIfldbl symbol, which
 	indiciates that stdio has a symbol to print long doubles.
 
-d_PRIEldbl (longdblfio.U):
-	This variable conditionally defines the PERL_PRIfldlbl symbol, which
+d_PRIEUldbl (longdblfio.U):
+	This variable conditionally defines the PERL_PRIfldbl symbol, which
 	indiciates that stdio has a symbol to print long doubles.
+	The 'U' in the name is to separate this from d_PRIeldbl so that even
+	case-blind systems can see the difference.
 
 d_PRIfldbl (longdblfio.U):
-	This variable conditionally defines the PERL_PRIfldlbl symbol, which
+	This variable conditionally defines the PERL_PRIfldbl symbol, which
 	indiciates that stdio has a symbol to print long doubles.
 
-d_PRIFldbl (longdblfio.U):
-	This variable conditionally defines the PERL_PRIfldlbl symbol, which
+d_PRIFUldbl (longdblfio.U):
+	This variable conditionally defines the PERL_PRIfldbl symbol, which
 	indiciates that stdio has a symbol to print long doubles.
+	The 'U' in the name is to separate this from d_PRIfldbl so that even
+	case-blind systems can see the difference.
 
 d_PRIgldbl (longdblfio.U):
-	This variable conditionally defines the PERL_PRIfldlbl symbol, which
+	This variable conditionally defines the PERL_PRIfldbl symbol, which
 	indiciates that stdio has a symbol to print long doubles.
 
-d_PRIGldbl (longdblfio.U):
-	This variable conditionally defines the PERL_PRIfldlbl symbol, which
+d_PRIGUldbl (longdblfio.U):
+	This variable conditionally defines the PERL_PRIfldbl symbol, which
 	indiciates that stdio has a symbol to print long doubles.
+	The 'U' in the name is to separate this from d_PRIgldbl so that even
+	case-blind systems can see the difference.
 
 d_PRIi64 (quadfio.U):
 	This variable conditionally defines the PERL_PRIi64 symbol, which
@@ -1131,9 +1149,11 @@ d_PRIx64 (quadfio.U):
 	This variable conditionally defines the PERL_PRIx64 symbol, which
 	indiciates that stdio has a symbol to print 64-bit hexadecimal numbers.
 
-d_PRIX64 (quadfio.U):
-	This variable conditionally defines the PERL_PRIX64 symbol, which
+d_PRIXU64 (quadfio.U):
+	This variable conditionally defines the PERL_PRIXU64 symbol, which
 	indiciates that stdio has a symbol to print 64-bit hExADECimAl numbers.
+	The 'U' in the name is to separate this from d_PRIx64 so that even
+	case-blind systems can see the difference.
 
 d_pthread_yield (d_pthread_y.U):
 	This variable conditionally defines the HAS_PTHREAD_YIELD
@@ -1225,6 +1245,10 @@ d_scm_rights (d_socket.U):
 	which indicates that the SCM_RIGHTS is available.  #ifdef is
 	not enough because it may be an enum, glibc has been known to do this.
 
+d_SCNfldbl (longdblfio.U):
+	This variable conditionally defines the PERL_PRIfldbl symbol, which
+	indiciates that stdio has a symbol to scan long doubles.
+
 d_seekdir (d_readdir.U):
 	This variable conditionally defines HAS_SEEKDIR if seekdir() is
 	available.
@@ -1419,6 +1443,10 @@ d_sockpair (d_socket.U):
 	This variable conditionally defines the HAS_SOCKETPAIR symbol, which
 	indicates that the BSD socketpair() is supported.
 
+d_socks5_init (d_socks5_init.U):
+	This variable conditionally defines the HAS_SOCKS5_INIT symbol, which
+	indicates to the C program that the socks5_init() routine is available.
+
 d_sqrtl (d_sqrtl.U):
 	This variable conditionally defines the HAS_SQRTL symbol, which
 	indicates to the C program that the sqrtl() routine is available.
@@ -2753,7 +2781,7 @@ nveformat (perlxvf.U):
 	This variable contains the format string used for printing
 	a Perl NV using %e-ish floating point format.
 
-nvEformat (perlxvf.U):
+nvEUformat (perlxvf.U):
 	This variable contains the format string used for printing
 	a Perl NV using %E-ish floating point format.
 
@@ -2761,7 +2789,7 @@ nvfformat (perlxvf.U):
 	This variable confains the format string used for printing
 	a Perl NV using %f-ish floating point format.
 
-nvFformat (perlxvf.U):
+nvFUformat (perlxvf.U):
 	This variable confains the format string used for printing
 	a Perl NV using %F-ish floating point format.
 
@@ -2769,7 +2797,7 @@ nvgformat (perlxvf.U):
 	This variable contains the format string used for printing
 	a Perl NV using %g-ish floating point format.
 
-nvGformat (perlxvf.U):
+nvGUformat (perlxvf.U):
 	This variable contains the format string used for printing
 	a Perl NV using %G-ish floating point format.
 
@@ -3250,25 +3278,31 @@ sPRIeldbl (longdblfio.U):
 	This variable, if defined, contains the string used by stdio to
 	format long doubles (format 'e') for output.
 
-sPRIEldbl (longdblfio.U):
+sPRIEUldbl (longdblfio.U):
 	This variable, if defined, contains the string used by stdio to
 	format long doubles (format 'E') for output.
+	The 'U' in the name is to separate this from sPRIeldbl so that even
+	case-blind systems can see the difference.
 
 sPRIfldbl (longdblfio.U):
 	This variable, if defined, contains the string used by stdio to
 	format long doubles (format 'f') for output.
 
-sPRIFldbl (longdblfio.U):
+sPRIFUldbl (longdblfio.U):
 	This variable, if defined, contains the string used by stdio to
 	format long doubles (format 'F') for output.
+	The 'U' in the name is to separate this from sPRIfldbl so that even
+	case-blind systems can see the difference.
 
 sPRIgldbl (longdblfio.U):
 	This variable, if defined, contains the string used by stdio to
 	format long doubles (format 'g') for output.
 
-sPRIGldbl (longdblfio.U):
+sPRIGUldbl (longdblfio.U):
 	This variable, if defined, contains the string used by stdio to
 	format long doubles (format 'G') for output.
+	The 'U' in the name is to separate this from sPRIgldbl so that even
+	case-blind systems can see the difference.
 
 sPRIi64 (quadfio.U):
 	This variable, if defined, contains the string used by stdio to
@@ -3286,15 +3320,21 @@ sPRIx64 (quadfio.U):
 	This variable, if defined, contains the string used by stdio to
 	format 64-bit hexadecimal numbers (format 'x') for output.
 
-sPRIX64 (quadfio.U):
+sPRIXU64 (quadfio.U):
 	This variable, if defined, contains the string used by stdio to
 	format 64-bit hExADECimAl numbers (format 'X') for output.
+	The 'U' in the name is to separate this from sPRIx64 so that even
+	case-blind systems can see the difference.
 
 src (src.U):
 	This variable holds the path to the package source. It is up to
 	the Makefile to use this variable and set VPATH accordingly to
 	find the sources remotely.
 
+sSCNfldbl (longdblfio.U):
+	This variable, if defined, contains the string used by stdio to
+	format long doubles (format 'f') for input.
+
 ssizetype (ssizetype.U):
 	This variable defines ssizetype to be something like ssize_t, 
 	long or int.  It is used by functions that return a count 
@@ -3611,7 +3651,7 @@ uvxformat (perlxvf.U):
 	This variable contains the format string used for printing
 	a Perl UV as an unsigned hexadecimal integer in lowercase abcdef.
 
-uvXformat (perlxvf.U):
+uvXUformat (perlxvf.U):
 	This variable contains the format string used for printing
 	a Perl UV as an unsigned hexadecimal integer in uppercase ABCDEF.
 
diff --git a/Porting/config.sh b/Porting/config.sh
index 004fc8cd5f..d82f0b3c1c 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -8,7 +8,7 @@
 
 # Package name      : perl5
 # Source directory  : /m/fs/work/work/permanent/perl/pp4/perl
-# Configuration time: Fri Aug 18 04:57:25 EET DST 2000
+# Configuration time: Fri Sep  1 21:11:01 EET DST 2000
 # Configured by     : jhi
 # Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
 
@@ -57,10 +57,12 @@ cccdlflags=' '
 ccdlflags='  -Wl,-rpath,/opt/perl/lib/5.7.0/alpha-dec_osf-thread/CORE'
 ccflags='-pthread -std -DLANGUAGE_C'
 ccflags_uselargefiles=''
+ccname='cc'
 ccsymbols='__alpha=1 __LANGUAGE_C__=1 __osf__=1 __unix__=1 _LONGLONG=1 _SYSTYPE_BSD=1 SYSTYPE_BSD=1 unix=1'
+ccversion='V5.6-082'
 cf_by='jhi'
 cf_email='yourname@yourhost.yourplace.com'
-cf_time='Fri Aug 18 04:57:25 EET DST 2000'
+cf_time='Fri Sep  1 21:11:01 EET DST 2000'
 charsize='1'
 chgrp=''
 chmod=''
@@ -84,10 +86,10 @@ crosscompile='undef'
 cryptlib=''
 csh='csh'
 d_Gconvert='gcvt((x),(n),(b))'
-d_PRIEldbl='define'
-d_PRIFldbl='define'
-d_PRIGldbl='define'
-d_PRIX64='define'
+d_PRIEUldbl='define'
+d_PRIFUldbl='define'
+d_PRIGUldbl='define'
+d_PRIXU64='define'
 d_PRId64='define'
 d_PRIeldbl='define'
 d_PRIfldbl='define'
@@ -96,6 +98,7 @@ d_PRIi64='define'
 d_PRIo64='define'
 d_PRIu64='define'
 d_PRIx64='define'
+d_SCNfldbl='define'
 d_access='define'
 d_accessx='undef'
 d_alarm='define'
@@ -325,6 +328,7 @@ d_sigsetjmp='define'
 d_socket='define'
 d_socklen_t='undef'
 d_sockpair='define'
+d_socks5_init='undef'
 d_sqrtl='define'
 d_statblks='define'
 d_statfs_f_flags='define'
@@ -390,7 +394,7 @@ dlext='so'
 dlsrc='dl_dlopen.xs'
 doublesize='8'
 drand01='drand48()'
-dynamic_ext='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Sys/Hostname Sys/Syslog Thread attrs re'
+dynamic_ext='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread attrs re'
 eagain='EAGAIN'
 ebcdic='undef'
 echo='echo'
@@ -399,7 +403,7 @@ emacs=''
 eunicefix=':'
 exe_ext=''
 expr='expr'
-extensions='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Sys/Hostname Sys/Syslog Thread attrs re Errno'
+extensions='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread attrs re Errno'
 fflushNULL='define'
 fflushall='undef'
 find=''
@@ -539,7 +543,7 @@ intsize='4'
 ivdformat='"ld"'
 ivsize='8'
 ivtype='long'
-known_extensions='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob GDBM_File IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Sys/Hostname Sys/Syslog Thread attrs re'
+known_extensions='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob GDBM_File IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread attrs re'
 ksh=''
 large=''
 ld='ld'
@@ -610,9 +614,9 @@ nm_opt='-p'
 nm_so_opt=''
 nonxs_ext='Errno'
 nroff='nroff'
-nvEformat='"E"'
-nvFformat='"F"'
-nvGformat='"G"'
+nvEUformat='"E"'
+nvFUformat='"F"'
+nvGUformat='"G"'
 nveformat='"e"'
 nvfformat='"f"'
 nvgformat='"g"'
@@ -659,10 +663,10 @@ revision='5'
 rm='rm'
 rmail=''
 runnm='true'
-sPRIEldbl='"E"'
-sPRIFldbl='"F"'
-sPRIGldbl='"G"'
-sPRIX64='"lX"'
+sPRIEUldbl='"E"'
+sPRIFUldbl='"F"'
+sPRIGUldbl='"G"'
+sPRIXU64='"lX"'
 sPRId64='"ld"'
 sPRIeldbl='"e"'
 sPRIfldbl='"f"'
@@ -671,6 +675,7 @@ sPRIi64='"li"'
 sPRIo64='"lo"'
 sPRIu64='"lu"'
 sPRIx64='"lx"'
+sSCNfldbl='"f"'
 sched_yield='sched_yield()'
 scriptdir='/opt/perl/bin'
 scriptdirexp='/opt/perl/bin'
@@ -778,7 +783,7 @@ usevendorprefix='undef'
 usevfork='false'
 usrinc='/usr/include'
 uuname=''
-uvXformat='"lX"'
+uvXUformat='"lX"'
 uvoformat='"lo"'
 uvsize='8'
 uvtype='unsigned long'
diff --git a/Porting/config_H b/Porting/config_H
index 7053239636..eb27ac0a02 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -17,7 +17,7 @@
 /*
  * Package name      : perl5
  * Source directory  : /m/fs/work/work/permanent/perl/pp4/perl
- * Configuration time: Fri Aug 18 04:57:25 EET DST 2000
+ * Configuration time: Fri Sep  1 21:11:01 EET DST 2000
  * Configured by     : jhi
  * Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
  */
@@ -1983,6 +1983,12 @@
 /*#define	HAS_MSG_PROXY	/ **/
 #define	HAS_SCM_RIGHTS	/**/
 
+/* HAS_SOCKS5_INIT:
+ *	This symbol, if defined, indicates that the socks5_init routine is
+ *	available to initialize SOCKS 5.
+ */
+/*#define HAS_SOCKS5_INIT		/ **/
+
 /* HAS_SQRTL:
  *	This symbol, if defined, indicates that the sqrtl routine is
  *	available to do long double square roots.
@@ -2318,6 +2324,12 @@
  */
 /*#define   I_INTTYPES                / **/
 
+/* I_LIBUTIL:
+ *	This symbol, if defined, indicates that <libutil.h> exists and
+ *	should be included.
+ */
+/*#define	I_LIBUTIL		/ **/
+
 /* I_MACH_CTHREADS:
  *     This symbol, if defined, indicates to the C program that it should
  *     include <mach/cthreads.h>.
@@ -2516,8 +2528,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	"f"	/**/
 #define PERL_PRIgldbl	"g"	/**/
+#define PERL_PRIeldbl	"e"	/**/
+#define PERL_SCNfldbl	"f"	/**/
 
 /* Off_t:
  *	This symbol holds the type used to declare offsets in the kernel.
@@ -3151,10 +3173,4 @@
 #define PERL_XS_APIVERSION "5.7.0"
 #define PERL_PM_APIVERSION "5.005"
 
-/* I_LIBUTIL:
- *	This symbol, if defined, indicates that <libutil.h> exists and
- *	should be included.
- */
-/*#define	I_LIBUTIL		/ **/
-
 #endif