Change 34500 by [EMAIL PROTECTED] on 2008/10/17 10:15:17
Integrate:
[ 34470]
Define HAS_QUAD on Win32 and introduce new value for QUADKIND
where appropriate.
This doesn't make much difference on Win32 because IVSIZE is still 4,
but access to the appropriate "quad" type is still useful, e.g. for
Y2038 support.
Affected files ...
... //depot/maint-5.10/perl/win32/config.bc#7 integrate
... //depot/maint-5.10/perl/win32/config.gc#8 integrate
... //depot/maint-5.10/perl/win32/config.vc#8 integrate
... //depot/maint-5.10/perl/win32/config.vc64#8 integrate
... //depot/maint-5.10/perl/win32/config_H.bc#6 integrate
... //depot/maint-5.10/perl/win32/config_H.gc#6 integrate
... //depot/maint-5.10/perl/win32/config_H.vc#6 integrate
... //depot/maint-5.10/perl/win32/config_H.vc64#7 integrate
Differences ...
==== //depot/maint-5.10/perl/win32/config.bc#7 (text) ====
Index: perl/win32/config.bc
--- perl/win32/config.bc#6~33955~ 2008-05-30 18:54:46.000000000 -0700
+++ perl/win32/config.bc 2008-10-17 03:15:17.000000000 -0700
@@ -345,7 +345,7 @@
d_pwpasswd='undef'
d_pwquota='undef'
d_qgcvt='undef'
-d_quad='undef'
+d_quad='define'
d_random_r='undef'
d_readdir64_r='undef'
d_readdir='define'
==== //depot/maint-5.10/perl/win32/config.gc#8 (text) ====
Index: perl/win32/config.gc
--- perl/win32/config.gc#7~33955~ 2008-05-30 18:54:46.000000000 -0700
+++ perl/win32/config.gc 2008-10-17 03:15:17.000000000 -0700
@@ -345,7 +345,7 @@
d_pwpasswd='undef'
d_pwquota='undef'
d_qgcvt='undef'
-d_quad='undef'
+d_quad='define'
d_random_r='undef'
d_readdir64_r='undef'
d_readdir='define'
@@ -844,7 +844,7 @@
procselfexe=''
prototype='define'
ptrsize='4'
-quadkind='5'
+quadkind='3'
quadtype='long long'
randbits='15'
randfunc='rand'
==== //depot/maint-5.10/perl/win32/config.vc#8 (text) ====
Index: perl/win32/config.vc
--- perl/win32/config.vc#7~33955~ 2008-05-30 18:54:46.000000000 -0700
+++ perl/win32/config.vc 2008-10-17 03:15:17.000000000 -0700
@@ -345,7 +345,7 @@
d_pwpasswd='undef'
d_pwquota='undef'
d_qgcvt='undef'
-d_quad='undef'
+d_quad='define'
d_random_r='undef'
d_readdir64_r='undef'
d_readdir='define'
==== //depot/maint-5.10/perl/win32/config.vc64#8 (text) ====
Index: perl/win32/config.vc64
--- perl/win32/config.vc64#7~33955~ 2008-05-30 18:54:46.000000000 -0700
+++ perl/win32/config.vc64 2008-10-17 03:15:17.000000000 -0700
@@ -844,7 +844,7 @@
procselfexe=''
prototype='define'
ptrsize='8'
-quadkind='4'
+quadkind='5'
quadtype='__int64'
randbits='15'
randfunc='rand'
==== //depot/maint-5.10/perl/win32/config_H.bc#6 (text+w) ====
Index: perl/win32/config_H.bc
--- perl/win32/config_H.bc#5~33892~ 2008-05-20 16:03:07.000000000 -0700
+++ perl/win32/config_H.bc 2008-10-17 03:15:17.000000000 -0700
@@ -849,9 +849,10 @@
/* HAS_QUAD:
* This symbol, if defined, tells that there's a 64-bit integer type,
* Quad_t, and its unsigned counterpar, Uquad_t. QUADKIND will be one
- * of QUAD_IS_INT, QUAD_IS_LONG, QUAD_IS_LONG_LONG, or QUAD_IS_INT64_T.
+ * of QUAD_IS_INT, QUAD_IS_LONG, QUAD_IS_LONG_LONG, QUAD_IS_INT64_T,
+ * or QUAD_IS___INT64.
*/
-/*#define HAS_QUAD /**/
+#define HAS_QUAD /**/
#ifdef HAS_QUAD
# define Quad_t __int64 /**/
# define Uquad_t unsigned __int64 /**/
@@ -860,6 +861,7 @@
# define QUAD_IS_LONG 2
# define QUAD_IS_LONG_LONG 3
# define QUAD_IS_INT64_T 4
+# define QUAD_IS___INT64 5
#endif
/* OSNAME:
==== //depot/maint-5.10/perl/win32/config_H.gc#6 (text+w) ====
Index: perl/win32/config_H.gc
--- perl/win32/config_H.gc#5~33892~ 2008-05-20 16:03:07.000000000 -0700
+++ perl/win32/config_H.gc 2008-10-17 03:15:17.000000000 -0700
@@ -849,22 +849,25 @@
/* HAS_QUAD:
* This symbol, if defined, tells that there's a 64-bit integer type,
* Quad_t, and its unsigned counterpar, Uquad_t. QUADKIND will be one
- * of QUAD_IS_INT, QUAD_IS_LONG, QUAD_IS_LONG_LONG, or QUAD_IS_INT64_T.
+ * of QUAD_IS_INT, QUAD_IS_LONG, QUAD_IS_LONG_LONG, QUAD_IS_INT64_T,
+ * or QUAD_IS___INT64.
*/
-/*#define HAS_QUAD /**/
+#define HAS_QUAD /**/
#ifdef HAS_QUAD
# ifndef _MSC_VER
# define Quad_t long long /**/
# define Uquad_t unsigned long long /**/
+# define QUADKIND 3 /**/
# else
# define Quad_t __int64 /**/
# define Uquad_t unsigned __int64 /**/
+# define QUADKIND 5 /**/
# endif
-# define QUADKIND 5 /**/
# define QUAD_IS_INT 1
# define QUAD_IS_LONG 2
# define QUAD_IS_LONG_LONG 3
# define QUAD_IS_INT64_T 4
+# define QUAD_IS___INT64 5
#endif
/* OSNAME:
==== //depot/maint-5.10/perl/win32/config_H.vc#6 (text+w) ====
Index: perl/win32/config_H.vc
--- perl/win32/config_H.vc#5~33892~ 2008-05-20 16:03:07.000000000 -0700
+++ perl/win32/config_H.vc 2008-10-17 03:15:17.000000000 -0700
@@ -849,22 +849,25 @@
/* HAS_QUAD:
* This symbol, if defined, tells that there's a 64-bit integer type,
* Quad_t, and its unsigned counterpar, Uquad_t. QUADKIND will be one
- * of QUAD_IS_INT, QUAD_IS_LONG, QUAD_IS_LONG_LONG, or QUAD_IS_INT64_T.
+ * of QUAD_IS_INT, QUAD_IS_LONG, QUAD_IS_LONG_LONG, QUAD_IS_INT64_T.
+ * or QUAD_IS___INT64.
*/
-/*#define HAS_QUAD /**/
+#define HAS_QUAD /**/
#ifdef HAS_QUAD
# ifndef __GNUC__
# define Quad_t __int64 /**/
# define Uquad_t unsigned __int64 /**/
+# define QUADKIND 5 /**/
# else
# define Quad_t long long /**/
# define Uquad_t unsigned long long /**/
+# define QUADKIND 3 /**/
# endif
-# define QUADKIND 5 /**/
# define QUAD_IS_INT 1
# define QUAD_IS_LONG 2
# define QUAD_IS_LONG_LONG 3
# define QUAD_IS_INT64_T 4
+# define QUAD_IS___INT64 5
#endif
/* OSNAME:
==== //depot/maint-5.10/perl/win32/config_H.vc64#7 (text) ====
Index: perl/win32/config_H.vc64
--- perl/win32/config_H.vc64#6~34339~ 2008-09-11 02:11:57.000000000 -0700
+++ perl/win32/config_H.vc64 2008-10-17 03:15:17.000000000 -0700
@@ -849,17 +849,19 @@
/* HAS_QUAD:
* This symbol, if defined, tells that there's a 64-bit integer type,
* Quad_t, and its unsigned counterpar, Uquad_t. QUADKIND will be one
- * of QUAD_IS_INT, QUAD_IS_LONG, QUAD_IS_LONG_LONG, or QUAD_IS_INT64_T.
+ * of QUAD_IS_INT, QUAD_IS_LONG, QUAD_IS_LONG_LONG, QUAD_IS_INT64_T
+ * or QUAD_IS___INT64.
*/
#define HAS_QUAD /**/
#ifdef HAS_QUAD
# define Quad_t __int64 /**/
# define Uquad_t unsigned __int64 /**/
-# define QUADKIND 4 /**/
+# define QUADKIND 5 /**/
# define QUAD_IS_INT 1
# define QUAD_IS_LONG 2
# define QUAD_IS_LONG_LONG 3
# define QUAD_IS_INT64_T 4
+# define QUAD_IS___INT64 5
#endif
/* OSNAME:
End of Patch.
