diff options
| author | Andrey Hristov <andrey@php.net> | 2010-08-16 09:44:13 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2010-08-16 09:44:13 +0000 |
| commit | 2f2cdc6a51aa744931a767efa8e6aeff840c62ad (patch) | |
| tree | 9786236d35f8f8b74176fc36acdf9a7941c769d9 /ext | |
| parent | 6c579efc43e8bbf556f02bf91f31da7589cd6a25 (diff) | |
| download | php-git-2f2cdc6a51aa744931a767efa8e6aeff840c62ad.tar.gz | |
Sync with trunk, fixes build failure on MacOSX.
Fix for Bug #52417 MySQLi build failure with mysqlnd
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.h | 2 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_portability.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h index 055c525517..eafd356c8a 100644 --- a/ext/mysqlnd/mysqlnd.h +++ b/ext/mysqlnd/mysqlnd.h @@ -286,7 +286,7 @@ ZEND_BEGIN_MODULE_GLOBALS(mysqlnd) long debug_realloc_fail_threshold; ZEND_END_MODULE_GLOBALS(mysqlnd) -PHPAPI ZEND_DECLARE_MODULE_GLOBALS(mysqlnd); +PHPAPI ZEND_EXTERN_MODULE_GLOBALS(mysqlnd); #ifdef ZTS #define MYSQLND_G(v) TSRMG(mysqlnd_globals_id, zend_mysqlnd_globals *, v) diff --git a/ext/mysqlnd/mysqlnd_portability.h b/ext/mysqlnd/mysqlnd_portability.h index 532c719594..40f614ab04 100644 --- a/ext/mysqlnd/mysqlnd_portability.h +++ b/ext/mysqlnd/mysqlnd_portability.h @@ -12,6 +12,8 @@ This file is public domain and comes with NO WARRANTY of any kind */ #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) |