andrey Mon, 31 May 2010 16:51:03 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=299994
Log:
try to workaround problems with non-c99 on HPUX
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-05-31 14:37:39 UTC (rev 299993)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h
2010-05-31 16:51:03 UTC (rev 299994)
@@ -38,6 +38,12 @@
# include <ext/mysqlnd/php_mysqlnd_config.h>
#endif /* _WIN32... */
+#if __STDC_VERSION__ < 199901L && !defined(atoll)
+ /* "inline" is a keyword */
+ #define atoll atol
+#endif
+
+
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h 2010-05-31 14:37:39 UTC
(rev 299993)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h 2010-05-31 16:51:03 UTC
(rev 299994)
@@ -12,6 +12,8 @@
#ifndef MYSQLND_PORTABILITY_H
#define MYSQLND_PORTABILITY_H
+
+
/* Comes from global.h as OFFSET, renamed to STRUCT_OFFSET */
#define STRUCT_OFFSET(t, f) ((size_t)(char *)&((t *)0)->f)
@@ -38,6 +40,12 @@
# include <ext/mysqlnd/php_mysqlnd_config.h>
#endif /* _WIN32... */
+#if __STDC_VERSION__ < 199901L && !defined(atoll)
+ /* "inline" is a keyword */
+ #define atoll atol
+#endif
+
+
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php