andrey Mon, 04 Oct 2010 12:59:29 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=304001
Log:
Even better patch
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h
2010-10-04 12:55:08 UTC (rev 304000)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h
2010-10-04 12:59:29 UTC (rev 304001)
@@ -481,22 +481,18 @@
short/long to/from some place in memory V should be a (not
register) variable, M is a pointer to byte */
-#ifdef WORDS_BIGENDIAN
-
#ifndef float8get
+
+#ifdef WORDS_BIGENDIAN
#define float8get(V,M) memcpy((char*) &(V),(char*) (M),
sizeof(double))
#define float8store(T,V) memcpy((char*) (T),(char*) &(V),
sizeof(double))
-#endif /* float8get */
-
#else
-
-#ifndef float8get
#define float8get(V,M) memcpy((char*) &(V),(char*) (M),sizeof(double))
#define float8store(T,V) memcpy((char*) (T),(char*) &(V),sizeof(double))
-#endif /* float8get */
-
#endif /* WORDS_BIGENDIAN */
+#endif /* float8get */
+
#endif /* MYSQLND_PORTABILITY_H */
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h 2010-10-04 12:55:08 UTC
(rev 304000)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h 2010-10-04 12:59:29 UTC
(rev 304001)
@@ -481,22 +481,18 @@
short/long to/from some place in memory V should be a (not
register) variable, M is a pointer to byte */
-#ifdef WORDS_BIGENDIAN
-
#ifndef float8get
+
+#ifdef WORDS_BIGENDIAN
#define float8get(V,M) memcpy((char*) &(V),(char*) (M),
sizeof(double))
#define float8store(T,V) memcpy((char*) (T),(char*) &(V),
sizeof(double))
-#endif /* float8get */
-
#else
-
-#ifndef float8get
#define float8get(V,M) memcpy((char*) &(V),(char*) (M),sizeof(double))
#define float8store(T,V) memcpy((char*) (T),(char*) &(V),sizeof(double))
-#endif /* float8get */
-
#endif /* WORDS_BIGENDIAN */
+#endif /* float8get */
+
#endif /* MYSQLND_PORTABILITY_H */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
