Apply bleadperl@34470 by hand while waiting for the git master to catch up.

diff --git a/win32/config.bc b/win32/config.bc
index c857637..169091d 100644 (file)
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -345,7 +345,7 @@ d_pwgecos='undef'
 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'

diff --git a/win32/config.gc b/win32/config.gc
index 9cb80b2..06ed8c4 100644 (file)
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -345,7 +345,7 @@ d_pwgecos='undef'
 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'
@@ -845,7 +845,7 @@ privlibexp='~INST_TOP~~INST_VER~\lib'
 procselfexe=''
 prototype='define'
 ptrsize='4'
-quadkind='5'
+quadkind='3'
 quadtype='long long'
 randbits='15'
 randfunc='rand'

diff --git a/win32/config.vc64 b/win32/config.vc64
index 0834ced..af532ac 100644 (file)
--- a/win32/config.vc64
+++ b/win32/config.vc64
@@ -845,7 +845,7 @@ privlibexp='~INST_TOP~~INST_VER~\lib'
 procselfexe=''
 prototype='define'
 ptrsize='8'
-quadkind='4'
+quadkind='5'
 quadtype='__int64'
 randbits='15'
 randfunc='rand'

diff --git a/win32/config_H.bc b/win32/config_H.bc
index b32f385..958578a 100644 (file)
--- a/win32/config_H.bc
+++ b/win32/config_H.bc
@@ -909,9 +909,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    /**/
@@ -920,6 +921,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:

diff --git a/win32/config_H.gc b/win32/config_H.gc
index 176f136..33cac10 100644 (file)
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -909,22 +909,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:

diff --git a/win32/config_H.vc b/win32/config_H.vc
index ac7d22d..ecf7af3 100644 (file)
--- a/win32/config_H.vc
+++ b/win32/config_H.vc
@@ -909,24 +909,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       /**/
 #ifdef HAS_QUAD
 #   ifndef __GNUC__
 #      define Quad_t __int64   /**/
 #      define Uquad_t unsigned __int64 /**/
-#       define QUADKIND 5      /**/
+#      define QUADKIND 5       /**/
 #   else
 #      define Quad_t long long /**/
 #      define Uquad_t unsigned long long       /**/
-#       define QUADKIND 3       /**/
+#      define QUADKIND 3       /**/
 #   endif
 #   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
+#   define QUAD_IS___INT64     5
 #endif
 
 /* OSNAME:

diff --git a/win32/config_H.vc64 b/win32/config_H.vc64
index 279390f..a42c71c 100644 (file)
--- a/win32/config_H.vc64
+++ b/win32/config_H.vc64
@@ -909,17 +909,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: