PHP mysqlnd svn commit: r842 - trunk/mysqlnd

Author: ahristov
Date: 2007-07-26 16:41:55 +0200 (Thu, 26 Jul 2007) New Revision: 842

Added:

   trunk/mysqlnd/CREDITS
   trunk/mysqlnd/config.w32
   trunk/mysqlnd/config9.m4

   trunk/mysqlnd/portability.h
Modified:

   trunk/mysqlnd/mysqlnd.h
Log:
Fixes from CVS

Added: trunk/mysqlnd/CREDITS

• trunk/mysqlnd/CREDITS 2007-07-25 12:41:31 UTC (rev 841)
  +++ trunk/mysqlnd/CREDITS 2007-07-26 14:41:55 UTC (rev 842)
  @@ -0,0 +1,2 @@
  +MySQLnd
  +Georg Richter, Andrey Hristov, Ulf Wendel
  

Added: trunk/mysqlnd/config.w32

• trunk/mysqlnd/config.w32 2007-07-25 12:41:31 UTC (rev 841)
  +++ trunk/mysqlnd/config.w32 2007-07-26 14:41:55 UTC (rev 842)
  @@ -0,0 +1,64 @@
  +// $Id: config.w32,v 1.1 2007/07/25 23:47:32 jani Exp $
  +// vim:ft=javascript
  +
  +// Note: The extension name is "mysqli", you enable it with "--with-mysqli".
  +// The "--enable-mysqlnd" tells to use "mysqli", if enabled, with the bundled
  +// client library to connect to the MySQL server, i.e. no external MySQL
  +// client library is needed to perform the build.
  +
  +ARG_WITH("mysqli", "MySQLi support", "no");
  +ARG_ENABLE("mysqlnd", "MySQLi with mysqlnd support", "no");
  +
  +if (PHP_MYSQLI != "no") {
  +
  + mysqli_source =
  + "mysqli.c " +
  + "mysqli_api.c " +
  + "mysqli_driver.c " +
  + "mysqli_embedded.c " +
  + "mysqli_exception.c " +
  + "mysqli_fe.c " +
  + "mysqli_nonapi.c " +
  + "mysqli_prop.c " +
  + "mysqli_report.c " +
  + "mysqli_warning.c";
  +
  + if (PHP_MYSQLND == "no") {
  + if (CHECK_LIB("libmysql.lib", "mysqli", PHP_MYSQLI) &&
  + CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_MYSQLI +
  + "\\include;" + PHP_PHP_BUILD +
  + "\\include\\mysql;" + PHP_MYSQLI)) {
  + // No "mysqli_repl.c" when using "mysqlnd"
  + mysqli_extra_sources = "mysqli_repl.c";
  + EXTENSION("mysqli", mysqli_source + " " + mysqli_extra_sources);
  + AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
  + } else {
  + WARNING("mysqli not enabled; libraries and headers not found");
  + }
  +
  + } else {
  +
  + mysqlnd_source =
  + "mysqlnd.c " +
  +// "mysqlnd_alloc.c " +
  + "mysqlnd_charset.c " +
  + "mysqlnd_loaddata.c " +
  + "mysqlnd_palloc.c " +
  + "mysqlnd_ps.c " +
  + "mysqlnd_ps_codec.c " +
  + "mysqlnd_qcache.c " +
  + "mysqlnd_result.c " +
  + "mysqlnd_result_meta.c " +
  + "mysqlnd_statistics.c " +
  + "mysqlnd_wireprotocol.c";
  +
  + EXTENSION("mysqli", mysqli_source);
  + // Specify that add "mysqlnd" sources, but use same object file
  + // directory as the "mysqli" sources
  + // FIXME the hard coded "ext/mysqli/mysqlnd" prevents pointing
  + // out sources in another directory? Like above: PHP_MYSQLI + "\\include;"
  + ADD_SOURCES("ext/mysqli/mysqlnd", mysqlnd_source, "mysqli");
  + AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
  + AC_DEFINE('HAVE_MYSQLND' , 1, 'MySQL native driver support enabled');
  + }
  +}
  

Added: trunk/mysqlnd/config9.m4

• trunk/mysqlnd/config9.m4 2007-07-25 12:41:31 UTC (rev 841)
  +++ trunk/mysqlnd/config9.m4 2007-07-26 14:41:55 UTC (rev 842)
  @@ -0,0 +1,29 @@
  +dnl
  +dnl $Id: config9.m4,v 1.1 2007/07/25 23:47:32 jani Exp $
  +dnl config.m4 for mysqlnd driver
  +
  +dnl If some extension uses mysqlnd it will get compiled in PHP core
  +if test "$PHP_MYSQLND_ENABLED" = "yes"; then
  + 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\
  + mysqlnd_result.c mysqlnd_result_meta.c"
  +
  + PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, no)
  + PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
  + PHP_INSTALL_HEADERS([ext/mysqlnd])
  + PHP_INSTALL_HEADERS([$ext_builddir/php_mysqlnd_config.h])
  + AC_DEFINE([HAVE_MYSQLND], 1, [Whether mysqlnd is enabled])
  +
  + dnl This creates a file so it has to be after above macros
  + PHP_CHECK_TYPES([int8 uint8 int16 uint16 int32 uint32 uchar int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t], [
  + $ext_builddir/php_mysqlnd_config.h
  + ],[
  +#ifdef HAVE_SYS_TYPES_H
  +#include <sys/types.h>
  +#endif
  +#ifdef HAVE_STDINT_H
  +#include <stdint.h>
  +#endif
  + ])
  +fi
  

Modified: trunk/mysqlnd/mysqlnd.h

• trunk/mysqlnd/mysqlnd.h 2007-07-25 12:41:31 UTC (rev 841)
  +++ trunk/mysqlnd/mysqlnd.h 2007-07-26 14:41:55 UTC (rev 842)
  @@ -47,7 +47,7 @@ */ #define MYSQLND_DO_WIRE_CHECK_BEFORE_COMMAND 1

Do you need 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

-#include "portability.h"
+#include "mysqlnd_portability.h"
 

 #ifdef ZTS
 #include "TSRM.h"

Deleted: trunk/mysqlnd/portability.h

• trunk/mysqlnd/portability.h 2007-07-25 12:41:31 UTC (rev 841)
  +++ trunk/mysqlnd/portability.h 2007-07-26 14:41:55 UTC (rev 842)
  @@ -1,514 +0,0 @@ -/* Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB -This file is public domain and comes with NO WARRANTY of any kind */ - -/* - Parts of the original, which are not applicable to mysqlnd have been removed. - - With small modifications, mostly casting but adding few more macros by - Andrey Hristov <andrey@mysql.com> . The additions are in the public domain and - were added to improve the header file, to get it more consistent. -*/ - -/* Comes from global.h as OFFSET, renamed to STRUCT_OFFSET */ -#define STRUCT_OFFSET(t, f) ((size_t)(char *)&((t *)0)->f) - -#ifndef __attribute -#if !defined(__GNUC__) -#define __attribute(A) -#endif -#endif - -#ifdef __CYGWIN__ -/* We use a Unix API, so pretend it's not Windows */ -#undef WIN -#undef WIN32 -#undef _WIN -#undef _WIN32 -#undef _WIN64 -#undef __WIN__ -#undef __WIN32__ -#endif /* __CYGWIN__ */ - -#if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32) -# include <ext/mysqli/mysqlnd/config-win.h> -#elif PHP_MAJOR_VERSION < 6 -# include <main/php_config.h> -#endif /* _WIN32... */ - - -#ifdef HAVE_STDINT_H -#include <stdint.h> -#endif - - -#if SIZEOF_LONG_LONG > 4 && !defined(_LONG_LONG) -#define _LONG_LONG 1 /* For AIX string library */ -#endif - - -/* Go around some bugs in different OS and compilers */ -#if defined(_HPUX_SOURCE) && defined(HAVE_SYS_STREAM_H) -#include <sys/stream.h> /* HPUX 10.20 defines ulong here. UGLY !!! */ -#define HAVE_ULONG -#endif - - -#if SIZEOF_LONG_LONG > 4 -#define HAVE_LONG_LONG 1 -#endif - -/* Typdefs for easyier portability */ - -#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 - -#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 - -#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 - -#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 - -#if (SIZEOF_UCHAR == 0) -typedef unsigned char uchar; /* Short for unsigned char */ -#endif - - -#if (SIZEOF_INT32_T != 0) && (SIZEOF_UINT32_T != 0) -typedef int32_t int32; -typedef uint32_t uint32; - -#elif SIZEOF_INT == 4 - -#if (SIZEOF_INT32 == 0) -typedef signed int int32; -#endif -#if (SIZEOF_UINT32 == 0) -typedef unsigned int uint32; -#endif - -#elif SIZEOF_LONG == 4 - -#if (SIZEOF_INT32 == 0) -typedef signed long int32; -#endif -#if (SIZEOF_UINT32 == 0) -typedef unsigned long uint32; -#endif - -#else -error "Neither int or long is of 4 bytes width" -#endif - -#if (SIZEOF_ULONG == 0) && !defined(__USE_MISC) && !defined(ulong) -typedef unsigned long ulong; /* Short for unsigned long */ -#endif -#ifndef longlong_defined -#if defined(HAVE_LONG_LONG) && SIZEOF_LONG != 8 -typedef unsigned long long int ulonglong; /* ulong or unsigned long long */ -typedef long long int longlong; -#else -typedef unsigned long ulonglong; /* ulong or unsigned long long */ -typedef long longlong; -#endif -#endif - - -#define int1store(T,A) do { *((zend_uchar*) (T)) = (A); } while(0) -#define uint1korr(A) (*(((uint8*)(A)))) - -/* Bit values are sent in reverted order of bytes, compared to normal !!! */ -#define bit_uint2korr(A) ((uint16) (((uint16) (((uchar*) (A))[1])) +\ - ((uint16) (((uchar*) (A))[0]) << 8))) -#define bit_uint3korr(A) ((uint32) (((uint32) (((uchar*) (A))[2])) +\ - (((uint32) (((uchar*) (A))[1])) << 8) +\ - (((uint32) (((uchar*) (A))[0])) << 16))) - -#define bit_uint4korr(A) ((uint32) (((uint32) (((uchar*) (A))[3])) +\ - (((uint32) (((uchar*) (A))[2])) << 8) +\ - (((uint32) (((uchar*) (A))[1])) << 16) +\ - (((uint32) (((uchar*) (A))[0])) << 24))) - -#define bit_uint5korr(A) ((ulonglong)(((uint32) ((uchar) (A)[0])) +\ - (((uint32) ((uchar) (A)[1])) << 8) +\ - (((uint32) ((uchar) (A)[2])) << 16) +\ - (((uint32) ((uchar) (A)[3])) << 24)) +\ - (((ulonglong) ((uchar) (A)[4])) << 32)) - -#define bit_uint6korr(A) ((ulonglong)(((uint32) (((uchar*) (A))[5])) +\ - (((uint32) (((uchar*) (A))[4])) << 8) +\ - (((uint32) (((uchar*) (A))[3])) << 16) +\ - (((uint32) (((uchar*) (A))[2])) << 24)) +\ - (((ulonglong) (((uint32) (((uchar*) (A))[1])) +\ - (((uint32) (((uchar*) (A))[0]) << 8)))) << 32)) - -#define bit_uint7korr(A) ((ulonglong)(((uint32) (((uchar*) (A))[6])) +\ - (((uint32) (((uchar*) (A))[5])) << 8) +\ - (((uint32) (((uchar*) (A))[4])) << 16) +\ - (((uint32) (((uchar*) (A))[3])) << 24)) +\ - (((ulonglong) (((uint32) (((uchar*) (A))[2])) +\ - (((uint32) (((uchar*) (A))[1])) << 8) +\ - (((uint32) (((uchar*) (A))[0])) << 16))) << 32)) - - -#define bit_uint8korr(A) ((ulonglong)(((uint32) (((uchar*) (A))[7])) +\ - (((uint32) (((uchar*) (A))[6])) << 8) +\ - (((uint32) (((uchar*) (A))[5])) << 16) +\ - (((uint32) (((uchar*) (A))[4])) << 24)) +\ - (((ulonglong) (((uint32) (((uchar*) (A))[3])) +\ - (((uint32) (((uchar*) (A))[2])) << 8) +\ - (((uint32) (((uchar*) (A))[1])) << 16) +\ - (((uint32) (((uchar*) (A))[0])) << 24))) << 32)) - - -/* -** Define-funktions for reading and storing in machine independent format -** (low byte first) -*/ - -/* Optimized store functions for Intel x86, non-valid for WIN64 */ -#if defined(__i386__) && !defined(_WIN64) -#define sint2korr(A) (*((int16 *) (A))) -#define sint3korr(A) ((int32) ((((uchar) (A)[2]) & 128) ? \ - (((uint32) 255L << 24) | \ - (((uint32) (uchar) (A)[2]) << 16) |\ - (((uint32) (uchar) (A)[1]) << 8) | \ - ((uint32) (uchar) (A)[0])) : \ - (((uint32) (uchar) (A)[2]) << 16) |\ - (((uint32) (uchar) (A)[1]) << 8) | \ - ((uint32) (uchar) (A)[0]))) -#define sint4korr(A) (*((long *) (A))) - -#define uint2korr(A) (*((uint16 *) (A))) -#define uint3korr(A) (uint32) (((uint32) ((uchar) (A)[0])) +\ - (((uint32) ((uchar) (A)[1])) << 8) +\ - (((uint32) ((uchar) (A)[2])) << 16)) -#define uint4korr(A) (*((unsigned long *) (A))) - - - -#define uint8korr(A) (*((ulonglong *) (A))) -#define sint8korr(A) (*((longlong *) (A))) -#define int2store(T,A) *((uint16*) (T))= (uint16) (A) -#define int3store(T,A) { \ - *(T)= (uchar) ((A));\ - *(T+1)=(uchar) (((uint) (A) >> 8));\ - *(T+2)=(uchar) (((A) >> 16)); } -#define int4store(T,A) *((long *) (T))= (long) (A) -#define int5store(T,A) { \ - *((uchar *)(T))= (uchar)((A));\ - *(((uchar *)(T))+1)=(uchar) (((A) >> 8));\ - *(((uchar *)(T))+2)=(uchar) (((A) >> 16));\ - *(((uchar *)(T))+3)=(uchar) (((A) >> 24)); \ - *(((uchar *)(T))+4)=(uchar) (((A) >> 32)); } - -/* From Andrey Hristov, based on int5store() */ -#define int6store(T,A) { \ - *(((uchar *)(T)))= (uchar)((A));\ - *(((uchar *)(T))+1))=(uchar) (((A) >> 8));\ - *(((uchar *)(T))+2))=(uchar) (((A) >> 16));\ - *(((uchar *)(T))+3))=(uchar) (((A) >> 24)); \ - *(((uchar *)(T))+4))=(uchar) (((A) >> 32)); \ - *(((uchar *)(T))+5))=(uchar) (((A) >> 40)); } - -#define int8store(T,A) *((ulonglong *) (T))= (ulonglong) (A) - -typedef union { - double v; - long m[2]; -} doubleget_union; -#define doubleget(V,M) { ((doubleget_union *)&(V))->m[0] = *((long*) (M)); \ - ((doubleget_union *)&(V))->m[1] = *(((long*) (M))+1); } -#define doublestore(T,V) { *((long *) (T)) = ((doubleget_union *)&(V))->m[0]; \ - *(((long *) (T))+1) = ((doubleget_union *)&(V))->m[1]; } -#define float4get(V,M) { *((float *) &(V)) = *((float*) (M)); } -#define float8get(V,M) doubleget((V),(M)) -/* From Andrey Hristov based on doubleget */ -#define floatget(V,M) memcpy((char*) &(V),(char*) (M),sizeof(float)) -#define floatstore float4store -#define float4store(V,M) memcpy((char*) (V),(char*) (&M),sizeof(float)) -#define float8store(V,M) doublestore((V),(M)) -#endif /* __i386__ */ - -#ifndef sint2korr -#define sint2korr(A) (int16) (((int16) ((uchar) (A)[0])) +\ - ((int16) ((int16) (A)[1]) << 8)) -#define sint3korr(A) ((int32) ((((uchar) (A)[2]) & 128) ? \ - (((uint32) 255L << 24) | \ - (((uint32) (uchar) (A)[2]) << 16) |\ - (((uint32) (uchar) (A)[1]) << 8) | \ - ((uint32) (uchar) (A)[0])) : \ - (((uint32) (uchar) (A)[2]) << 16) |\ - (((uint32) (uchar) (A)[1]) << 8) | \ - ((uint32) (uchar) (A)[0]))) -#define sint4korr(A) (int32) (((int32) ((uchar) (A)[0])) +\ - (((int32) ((uchar) (A)[1]) << 8)) +\ - (((int32) ((uchar) (A)[2]) << 16)) +\ - (((int32) ((int16) (A)[3]) << 24))) - -#define sint8korr(A) (longlong) uint8korr(A) -#define uint2korr(A) (uint16) (((uint16) ((uchar) (A)[0])) +\ - ((uint16) ((uchar) (A)[1]) << 8)) -#define uint3korr(A) (uint32) (((uint32) ((uchar) (A)[0])) +\ - (((uint32) ((uchar) (A)[1])) << 8) +\ - (((uint32) ((uchar) (A)[2])) << 16)) -#define uint4korr(A) (uint32) (((uint32) ((uchar) (A)[0])) +\ - (((uint32) ((uchar) (A)[1])) << 8) +\ - (((uint32) ((uchar) (A)[2])) << 16) +\ - (((uint32) ((uchar) (A)[3])) << 24)) -#define bit_uint5korr(A) ((ulonglong)(((uint32) ((uchar) (A)[0])) +\ - (((uint32) ((uchar) (A)[1])) << 8) +\ - (((uint32) ((uchar) (A)[2])) << 16) +\ - (((uint32) ((uchar) (A)[3])) << 24)) +\ - (((ulonglong) ((uchar) (A)[4])) << 32)) -/* From Andrey Hristov, based on uint5korr */ -#define bit_uint6korr(A) ((ulonglong)(((uint32) (((uchar*) (A))[5])) +\ - (((uint32) (((uchar*) (A))[4])) << 8) +\ - (((uint32) (((uchar*) (A))[3])) << 16) +\ - (((uint32) (((uchar*) (A))[2])) << 24)) +\ - (((ulonglong) (((uint32) (((uchar*) (A))[1])) +\ - (((uint32) (((uchar*) (A))[0]) << 8)))) << 32)) - -#define bit_uint7korr(A) ((ulonglong)(((uint32) (((uchar*) (A))[6])) +\ - (((uint32) (((uchar*) (A))[5])) << 8) +\ - (((uint32) (((uchar*) (A))[4])) << 16) +\ - (((uint32) (((uchar*) (A))[3])) << 24)) +\ - (((ulonglong) (((uint32) (((uchar*) (A))[2])) +\ - (((uint32) (((uchar*) (A))[1])) << 8) +\ - (((uint32) (((uchar*) (A))[0])) << 16))) << 32)) - - -#define bit_uint8korr(A) ((ulonglong)(((uint32) (((uchar*) (A))[7])) +\ - (((uint32) (((uchar*) (A))[6])) << 8) +\ - (((uint32) (((uchar*) (A))[5])) << 16) +\ - (((uint32) (((uchar*) (A))[4])) << 24)) +\ - (((ulonglong) (((uint32) (((uchar*) (A))[3])) +\ - (((uint32) (((uchar*) (A))[2])) << 8) +\ - (((uint32) (((uchar*) (A))[1])) << 16) +\ - (((uint32) (((uchar*) (A))[0])) << 24))) << 32)) - -#define uint8korr(A) ((ulonglong)(((uint32) ((uchar) (A)[0])) +\ - (((uint32) ((uchar) (A)[1])) << 8) +\ - (((uint32) ((uchar) (A)[2])) << 16) +\ - (((uint32) ((uchar) (A)[3])) << 24)) +\ - (((ulonglong) (((uint32) ((uchar) (A)[4])) +\ - (((uint32) ((uchar) (A)[5])) << 8) +\ - (((uint32) ((uchar) (A)[6])) << 16) +\ - (((uint32) ((uchar) (A)[7])) << 24))) << 32)) - - -#define int2store(T,A) do { uint def_temp= (uint) (A) ;\ - *((uchar*) (T)) = (uchar)(def_temp); \ - *((uchar*) (T+1)) = (uchar)((def_temp >> 8)); } while (0) -#define int3store(T,A) do { /*lint -save -e734 */\ - *(((char *)(T))) = (char) ((A));\ - *(((char *)(T))+1) = (char) (((A) >> 8));\ - *(((char *)(T))+2) = (char) (((A) >> 16)); \ - /*lint -restore */} while (0) -#define int4store(T,A) do { \ - *(((char *)(T))) = (char) ((A));\ - *(((char *)(T))+1) = (char) (((A) >> 8));\ - *(((char *)(T))+2) = (char) (((A) >> 16));\ - *(((char *)(T))+3) = (char) (((A) >> 24)); } while (0) -#define int5store(T,A) do { \ - *(((char *)(T))) = (char)((A));\ - *(((char *)(T))+1) = (char)(((A) >> 8));\ - *(((char *)(T))+2) = (char)(((A) >> 16));\ - *(((char *)(T))+3) = (char)(((A) >> 24)); \ - *(((char *)(T))+4) = (char)(((A) >> 32)); } while (0) -/* Based on int5store() from Andrey Hristov */ -#define int6store(T,A) do { \ - *(((char *)(T))) = (char)((A));\ - *(((char *)(T))+1) = (char)(((A) >> 8));\ - *(((char *)(T))+2) = (char)(((A) >> 16));\ - *(((char *)(T))+3) = (char)(((A) >> 24)); \ - *(((char *)(T))+4) = (char)(((A) >> 32)); \ - *(((char *)(T))+5) = (char)(((A) >> 40)); } while (0) -#define int8store(T,A) { uint def_temp= (uint) (A), def_temp2= (uint) ((A) >> 32); \ - int4store((T),def_temp); \ - int4store((T+4),def_temp2); \ - } -#ifdef WORDS_BIGENDIAN -#define float4store(T,A) do { \ - *(((char *)(T))) = (char) ((char *) &A)[3];\ - *(((char *)(T))+1) = (char) ((char *) &A)[2];\ - *(((char *)(T))+2) = (char) ((char *) &A)[1];\ - *(((char *)(T))+3) = (char) ((char *) &A)[0]; } while (0) - -#define float4get(V,M) do { float def_temp;\ - ((char*) &def_temp)[0] = (M)[3];\ - ((char*) &def_temp)[1] = (M)[2];\ - ((char*) &def_temp)[2] = (M)[1];\ - ((char*) &def_temp)[3] = (M)[0];\ - (V)=def_temp; } while (0) -#define float8store(T,V) do { \ - *(((char *)(T))) = (char) ((char *) &(V))[7];\ - *(((char *)(T))+1) = (char) ((char *) &(V))[6];\ - *(((char *)(T))+2) = (char) ((char *) &(V))[5];\ - *(((char *)(T))+3) = (char) ((char *) &(V))[4];\ - *(((char *)(T))+4) = (char) ((char *) &(V))[3];\ - *(((char *)(T))+5) = (char) ((char *) &(V))[2];\ - *(((char *)(T))+6) = (char) ((char *) &(V))[1];\ - *(((char *)(T))+7) = (char) ((char *) &(V))[0]; } while (0) - -#define float8get(V,M) do { double def_temp;\ - ((char*) &def_temp)[0] = (M)[7];\ - ((char*) &def_temp)[1] = (M)[6];\ - ((char*) &def_temp)[2] = (M)[5];\ - ((char*) &def_temp)[3] = (M)[4];\ - ((char*) &def_temp)[4] = (M)[3];\ - ((char*) &def_temp)[5] = (M)[2];\ - ((char*) &def_temp)[6] = (M)[1];\ - ((char*) &def_temp)[7] = (M)[0];\ - (V) = def_temp; \ - } while (0) -#else -#define float4get(V,M) memcpy((char*) &(V),(char*) (M),sizeof(float)) -#define float4store(V,M) memcpy((char*) (V),(char*) (&M),sizeof(float)) - -#if defined(__FLOAT_WORD_ORDER) && (__FLOAT_WORD_ORDER == __BIG_ENDIAN) -#define doublestore(T,V) do { \ - *(((char *)(T)))= ((char *) &(V))[4];\ - *(((char *)(T))+1)=(char) ((char *) &(V))[5];\ - *(((char *)(T))+2)=(char) ((char *) &(V))[6];\ - *(((char *)(T))+3)=(char) ((char *) &(V))[7];\ - *(((char *)(T))+4)=(char) ((char *) &(V))[0];\ - *(((char *)(T))+5)=(char) ((char *) &(V))[1];\ - *(((char *)(T))+6)=(char) ((char *) &(V))[2];\ - *(((char *)(T))+7)=(char) ((char *) &(V))[3];} while (0) -#define doubleget(V,M) do { double def_temp;\ - ((char*) &def_temp)[0]=(M)[4];\ - ((char*) &def_temp)[1]=(M)[5];\ - ((char*) &def_temp)[2]=(M)[6];\ - ((char*) &def_temp)[3]=(M)[7];\ - ((char*) &def_temp)[4]=(M)[0];\ - ((char*) &def_temp)[5]=(M)[1];\ - ((char*) &def_temp)[6]=(M)[2];\ - ((char*) &def_temp)[7]=(M)[3];\ - (V) = def_temp; } while (0) -#endif /* __FLOAT_WORD_ORDER */ - -#define float8get(V,M) doubleget((V),(M)) -#define float8store(V,M) doublestore((V),(M)) -#endif /* WORDS_BIGENDIAN */ - -#endif /* sint2korr */ - -/* Define-funktions for reading and storing in machine format from/to - short/long to/from some place in memory V should be a (not - register) variable, M is a pointer to byte */ - -#ifdef WORDS_BIGENDIAN - -#define ushortget(V,M) { V = (uint16) (((uint16) ((uchar) (M)[1]))+\ - ((uint16) ((uint16) (M)[0]) << 8)); } -#define shortget(V,M) { V = (short) (((short) ((uchar) (M)[1]))+\ - ((short) ((short) (M)[0]) << 8)); } -#define longget(V,M) do { int32 def_temp;\ - ((char*) &def_temp)[0]=(M)[0];\ - ((char*) &def_temp)[1]=(M)[1];\ - ((char*) &def_temp)[2]=(M)[2];\ - ((char*) &def_temp)[3]=(M)[3];\ - (V)=def_temp; } while (0) -#define ulongget(V,M) do { uint32 def_temp;\ - ((char*) &def_temp)[0]=(M)[0];\ - ((char*) &def_temp)[1]=(M)[1];\ - ((char*) &def_temp)[2]=(M)[2];\ - ((char*) &def_temp)[3]=(M)[3];\ - (V)=def_temp; } while (0) -#define shortstore(T,A) do { \ - uint def_temp=(uint) (A) ;\ - *(((char *)(T))+1)=(char)(def_temp); \ - *(((char *)(T))+0)=(char)(def_temp >> 8); } while (0) -#define longstore(T,A) do { \ - *(((char *)(T))+3)=(char)((A));\ - *(((char *)(T))+2)=(char)(((A) >> 8));\ - *(((char *)(T))+1)=(char)(((A) >> 16));\ - *(((char *)(T))+0)=(char)(((A) >> 24)); } while (0) - -#define doubleget(V,M) memcpy((char*) &(V),(char*) (M), sizeof(double)) -#define doublestore(T,V) memcpy((char*) (T),(char*) &(V), sizeof(double)) -#define longlongget(V,M) memcpy((char*) &(V),(char*) (M), sizeof(ulonglong)) -#define longlongstore(T,V) memcpy((char*) (T),(char*) &(V), sizeof(ulonglong)) - -#else - -#define ushortget(V,M) { V = uint2korr((M)); } -#define shortget(V,M) { V = sint2korr((M)); } -#define longget(V,M) { V = sint4korr((M)); } -#define ulongget(V,M) { V = uint4korr((M)); } -#define shortstore(T,V) int2store((T),(V)) -#define longstore(T,V) int4store((T),(V)) -#ifndef doubleget -#define doubleget(V,M) memcpy((char*) &(V),(char*) (M),sizeof(double)) -#define doublestore(T,V) memcpy((char*) (T),(char*) &(V),sizeof(double)) -#endif /* doubleget */ -#define longlongget(V,M) memcpy((char*) &(V),(char*) (M),sizeof(ulonglong)) -#define longlongstore(T,V) memcpy((char*) (T),(char*) &(V),sizeof(ulonglong)) - -#endif /* WORDS_BIGENDIAN */ - - -#ifdef PHP_WIN32 -#define MYSQLND_LLU_SPEC "%I64u" -#define MYSQLND_LL_SPEC "%I64d" -#ifndef L64 -#define L64(x) x##i64 -#endif -typedef unsigned __int64 my_uint64; -typedef __int64 my_int64; -typedef unsigned __int64 mynd_ulonglong; -typedef __int64 mynd_longlong; -#else -#define MYSQLND_LLU_SPEC "%llu" -#define MYSQLND_LL_SPEC "%lld" -#ifndef L64 -#define L64(x) xlistsL -#endif -#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 -#if (SIZEOF_INT64_T == 0) -typedef long long my_int64; -typedef long long mynd_longlong; -#else -typedef int64_t my_int64; -typedef int64_t mynd_longlong; -#endif -#endif - - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim<600: noet sw=4 ts=4 - */

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