Hosting Provided By

PHP mysqlnd svn commit: r839 - in trunk: mysqlnd php4/ext/mysql php5/ext/mysqli php6/ext/mysqli

From: <ahristov(at)mysql.com>
Date: Tue Jul 24 2007 - 15:12:36 EDT

Author: ahristov
Date: 2007-07-24 21:12:36 +0200 (Tue, 24 Jul 2007) New Revision: 839

Modified:

   trunk/mysqlnd/portability.h
   trunk/php4/ext/mysql/config.m4
   trunk/php5/ext/mysqli/config9.m4
   trunk/php6/ext/mysqli/config9.m4

Log:
AC_CHECK_TYPES is buggy with autconf 2.13, so we have to change it to something which works with the buggy software.

Modified: trunk/mysqlnd/portability.h

trunk/mysqlnd/portability.h 2007-07-24 15:54:01 UTC (rev 838) +++ trunk/mysqlnd/portability.h 2007-07-24 19:12:36 UTC (rev 839) @@ -59,62 +59,62 @@

/* Typdefs for easyier portability */

-#ifndef HAVE_INT8
-#ifndef HAVE_INT8_T
+#if (SIZEOF_INT8 == 0)
+#if (SIZEOF_INT8_T == 0)
 typedef signed char int8;			/* Signed integer >= 8    bits */

 #else

 typedef int8_t int8;				/* Signed integer >= 8    bits */

#endif
#endif

-#ifndef HAVE_UINT8
-#ifndef HAVE_UINT8_T
+#if (SIZEOF_UINT8 == 0)
+#if (SIZEOF_UINT8_T == 0)
 typedef unsigned char uint8;		/* Unsigned integer >= 8    bits */

 #else

 typedef uint8_t uint8;				/* Signed integer >= 8    bits */

#endif
#endif

-#ifndef HAVE_INT16
-#ifndef HAVE_INT16_T
+#if (SIZEOF_INT16 == 0)
+#if (SIZEOF_INT16_T == 0)
 typedef signed short int16;			/* Signed integer >= 16 bits */

 #else

 typedef int16_t int16;				/* Signed integer >= 16 bits */

#endif
#endif

-#ifndef HAVE_UINT16
-#ifndef HAVE_UINT16_T
+#if (SIZEOF_UINT16 == 0)
+#if (SIZEOF_UINT16_T == 0)
 typedef unsigned short uint16;		/* Signed integer >= 16 bits */

 #else

 typedef uint16_t uint16;			/* Signed integer >= 16 bits */

#endif
#endif

-#ifndef HAVE_UCHAR
+#if (SIZEOF_UCHAR == 0)
typedef unsigned char uchar; /* Short for unsigned char */
#endif

-#if defined(HAVE_INT32_T) && defined (HAVE_UINT32_T) +#if (SIZEOF_INT32_T != 0) && (SIZEOF_UINT32_T != 0) typedef int32_t int32;
typedef uint32_t uint32;

#elif SIZEOF_INT == 4

-#ifndef HAVE_INT32
+#ifndef (SIZEOF_INT32 == 0)
typedef signed int int32;
#endif

-#ifndef HAVE_UINT32
+#ifndef (SIZEOF_UINT32 == 0)
typedef unsigned int uint32;
#endif

Do you need help?

#elif SIZEOF_LONG == 4

-#ifndef HAVE_INT32
+#ifndef (SIZEOF_INT32 == 0)
typedef signed long int32;
#endif

-#ifndef HAVE_UINT32
+#ifndef (SIZEOF_UINT32 == 0)
typedef unsigned long uint32;
#endif

@@ -122,7 +122,7 @@
error "Neither int or long is of 4 bytes width"
#endif

-#if !defined(HAVE_ULONG) && !defined(__USE_MISC) && !defined(ulong) +#if (SIZEOF_ULONG == 0) && !defined(__USE_MISC) && !defined(ulong) typedef unsigned long ulong; /* Short for unsigned long */
#endif
#ifndef longlong_defined

@@ -487,14 +487,14 @@
#ifndef L64
#define L64(x) xlistsL
#endif

-#ifndef HAVE_UINT64_T
+#if (SIZEOF_UINT64_T == 0)
typedef unsigned long long my_uint64;
typedef unsigned long long mynd_ulonglong;
#else

typedef uint64_t my_uint64;
typedef uint64_t mynd_ulonglong;
#endif

-#ifndef HAVE_INT64_T
+#if (SIZEOF_INT64_T == 0)
typedef long long my_int64;
typedef long long mynd_longlong;
#else

Modified: trunk/php4/ext/mysql/config.m4

trunk/php4/ext/mysql/config.m4 2007-07-24 15:54:01 UTC (rev 838) +++ trunk/php4/ext/mysql/config.m4 2007-07-24 19:12:36 UTC (rev 839) @@ -75,14 +75,30 @@ fi

if test "$PHP_MYSQL" = "mysqlnd"; then

-  AC_CHECK_TYPES([int8, uint8, int16, uint16, int32, uint32, uchar],[],[], [
-  #include 
-  ])
+dnl  AC_CHECK_TYPES([int8, uint8, int16, uint16, int32, uint32, uchar],[],[], [
+dnl  #include 
+dnl  ])
+dnl  AC_CHECK_TYPES([int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, int64_t, uint64_t],[],[], [
+dnl  #include 
+dnl  ])
+  PHP_CHECK_SIZEOF(int8, 0)
+  PHP_CHECK_SIZEOF(uint8, 0)
+  PHP_CHECK_SIZEOF(int16, 0)
+  PHP_CHECK_SIZEOF(uint16, 0)
+  PHP_CHECK_SIZEOF(int32, 0)
+  PHP_CHECK_SIZEOF(uint32, 0)
+  PHP_CHECK_SIZEOF(int64, 0)
+  PHP_CHECK_SIZEOF(uint64, 0)
+  PHP_CHECK_SIZEOF(int8_t, 0)
+  PHP_CHECK_SIZEOF(uint8_t, 0)
+  PHP_CHECK_SIZEOF(int16_t, 0)
+  PHP_CHECK_SIZEOF(uint16_t, 0)
+  PHP_CHECK_SIZEOF(int32_t, 0)
Do you need more help? 
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
+  PHP_CHECK_SIZEOF(uint32_t, 0)
+  PHP_CHECK_SIZEOF(int64_t, 0)

+ PHP_CHECK_SIZEOF(uint64_t, 0)
+ PHP_CHECK_SIZEOF(ulong, 0)

AC_CHECK_TYPES([int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, int64_t, uint64_t],[],[], [
#include <stdint.h>
]) - MYSQL_MODULE_TYPE=builtin MYSQL_CHECKS sources="mysqlnd/mysqlnd.c mysqlnd/mysqlnd_charset.c mysqlnd/mysqlnd_wireprotocol.c \

Modified: trunk/php5/ext/mysqli/config9.m4

trunk/php5/ext/mysqli/config9.m4 2007-07-24 15:54:01 UTC (rev 838) +++ trunk/php5/ext/mysqli/config9.m4 2007-07-24 19:12:36 UTC (rev 839) @@ -82,14 +82,30 @@ dnl MySQLnd build dnl If some extension uses mysqlnd it will get compiled in PHP whether MYSQLi is enabled or not. if test "$PHP_MYSQLND_ENABLED" = "yes"; then - AC_CHECK_TYPES([int8, uint8, int16, uint16, int32, uint32, uchar],[],[], [ - #include <sys/types.h> - ]) +dnl AC_CHECK_TYPES([int8, uint8, int16, uint16, int32, uint32, uchar],[],[], [ +dnl #include <sys/types.h> +dnl ]) +dnl AC_CHECK_TYPES([int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, int64_t, uint64_t],[],[], [ +dnl #include <stdint.h> +dnl ]) + PHP_CHECK_SIZEOF(int8, 0) + PHP_CHECK_SIZEOF(uint8, 0) + PHP_CHECK_SIZEOF(int16, 0) + PHP_CHECK_SIZEOF(uint16, 0) + PHP_CHECK_SIZEOF(int32, 0) + PHP_CHECK_SIZEOF(uint32, 0) + PHP_CHECK_SIZEOF(int64, 0) + PHP_CHECK_SIZEOF(uint64, 0) + PHP_CHECK_SIZEOF(int8_t, 0) + PHP_CHECK_SIZEOF(uint8_t, 0) + PHP_CHECK_SIZEOF(int16_t, 0) + PHP_CHECK_SIZEOF(uint16_t, 0) + PHP_CHECK_SIZEOF(int32_t, 0) + PHP_CHECK_SIZEOF(uint32_t, 0) + PHP_CHECK_SIZEOF(int64_t, 0) + PHP_CHECK_SIZEOF(uint64_t, 0) + PHP_CHECK_SIZEOF(ulong, 0)
- AC_CHECK_TYPES([int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, int64_t, uint64_t],[],[], [
- #include <stdint.h>
- ]) - mysqlnd_sources="mysqlnd.c mysqlnd_charset.c mysqlnd_wireprotocol.c \ mysqlnd_ps.c mysqlnd_loaddata.c mysqlnd_palloc.c \ mysqlnd_ps_codec.c mysqlnd_statistics.c mysqlnd_qcache.c\

Modified: trunk/php6/ext/mysqli/config9.m4

trunk/php6/ext/mysqli/config9.m4 2007-07-24 15:54:01 UTC (rev 838) +++ trunk/php6/ext/mysqli/config9.m4 2007-07-24 19:12:36 UTC (rev 839) @@ -81,14 +81,30 @@ dnl MySQLnd build dnl If some extension uses mysqlnd it will get compiled in PHP whether MYSQLi is enabled or not. if test "$PHP_MYSQLND_ENABLED" = "yes"; then - AC_CHECK_TYPES([int8, uint8, int16, uint16, int32, uint32, uchar],[],[], [ - #include <sys/types.h> - ]) +dnl AC_CHECK_TYPES([int8, uint8, int16, uint16, int32, uint32, uchar],[],[], [ +dnl #include <sys/types.h> +dnl ]) +dnl AC_CHECK_TYPES([int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, int64_t, uint64_t],[],[], [ +dnl #include <stdint.h> +dnl ]) + PHP_CHECK_SIZEOF(int8, 0) + PHP_CHECK_SIZEOF(uint8, 0) + PHP_CHECK_SIZEOF(int16, 0) + PHP_CHECK_SIZEOF(uint16, 0) + PHP_CHECK_SIZEOF(int32, 0) + PHP_CHECK_SIZEOF(uint32, 0) + PHP_CHECK_SIZEOF(int64, 0) + PHP_CHECK_SIZEOF(uint64, 0) + PHP_CHECK_SIZEOF(int8_t, 0) + PHP_CHECK_SIZEOF(uint8_t, 0) + PHP_CHECK_SIZEOF(int16_t, 0) + PHP_CHECK_SIZEOF(uint16_t, 0) + PHP_CHECK_SIZEOF(int32_t, 0) + PHP_CHECK_SIZEOF(uint32_t, 0) + PHP_CHECK_SIZEOF(int64_t, 0) + PHP_CHECK_SIZEOF(uint64_t, 0) + PHP_CHECK_SIZEOF(ulong, 0)
- AC_CHECK_TYPES([int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, int64_t, uint64_t],[],[], [
- #include <stdint.h>
- ]) - mysqlnd_sources="mysqlnd.c mysqlnd_charset.c mysqlnd_wireprotocol.c \ mysqlnd_ps.c mysqlnd_loaddata.c mysqlnd_palloc.c \ mysqlnd_ps_codec.c mysqlnd_statistics.c mysqlnd_qcache.c\

-- 
MySQL Code Commits Mailing List
For list archives: 
http://lists.mysql.com/commits
To unsubscribe:    
http://lists.mysql.com/commits?unsub=lists@pantek.com

Received on Tue Jul 24 15:12:41 2007

Can we help you?

This message: [ Message body ]
Next message: Antony T Curtis: "Re: bk commit into 5.0 tree (antony:1.2511) BUG#25679"
Previous message: Sergei Golubchik: "Re: bk commit into 5.0 tree (antony:1.2511) BUG#25679"

Contemporary messages sorted: [ By Date ] [ By Thread ] [ By Subject ] [ By Author ] [ By messages with attachments ]

This archive was generated by hypermail 2.1.8 : Thu Aug 09 2007 - 19:13:22 EDT