diff options
| author | Johannes Schlüter <johannes@php.net> | 2008-02-09 21:59:17 +0000 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2008-02-09 21:59:17 +0000 |
| commit | 824b19a4d82648399d594f33127b2910fd09e811 (patch) | |
| tree | 71eb43aad9738d60940dff0dc756939e026e3b74 | |
| parent | da2a1799ca127c6799e864c03c52c82f05b3b5c1 (diff) | |
| download | php-git-824b19a4d82648399d594f33127b2910fd09e811.tar.gz | |
MFH: Fix build on Solaris
| -rw-r--r-- | ext/ldap/ldap.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 5c215c297a..0835537183 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -1728,10 +1728,9 @@ PHP_FUNCTION(ldap_get_option) zval_dtor(*retval); ZVAL_LONG(*retval, val); } break; -#if defined(LDAP_OPT_NETWORK_TIMEOUT) || defined(LDAP_X_OPT_CONNECT_TIMEOUT) +#ifdef LDAP_OPT_NETWORK_TIMEOUT case LDAP_OPT_NETWORK_TIMEOUT: { -# ifdef LDAP_OPT_NETWORK_TIMEOUT struct timeval *timeout; if (ldap_get_option(ld->link, LDAP_OPT_NETWORK_TIMEOUT, (void *) &timeout)) { @@ -1743,7 +1742,10 @@ PHP_FUNCTION(ldap_get_option) zval_dtor(*retval); ZVAL_LONG(*retval, timeout->tv_sec); ldap_memfree(timeout); -# elif defined(LDAP_X_OPT_CONNECT_TIMEOUT) + } break; +#elif defined(LDAP_X_OPT_CONNECT_TIMEOUT) + case LDAP_X_OPT_CONNECT_TIMEOUT: + { int timeout; if (ldap_get_option(ld->link, LDAP_X_OPT_CONNECT_TIMEOUT, &timeout)) { @@ -1751,7 +1753,6 @@ PHP_FUNCTION(ldap_get_option) } zval_dtor(*retval); ZVAL_LONG(*retval, (timeout / 1000)); -# endif } break; #endif /* options with string value */ @@ -1836,10 +1837,9 @@ PHP_FUNCTION(ldap_set_option) RETURN_FALSE; } } break; -#if defined(LDAP_OPT_NETWORK_TIMEOUT) || defined(LDAP_X_OPT_CONNECT_TIMEOUT) +#ifdef LDAP_OPT_NETWORK_TIMEOUT case LDAP_OPT_NETWORK_TIMEOUT: { -# ifdef LDAP_OPT_NETWORK_TIMEOUT struct timeval timeout; convert_to_long_ex(newval); @@ -1848,15 +1848,17 @@ PHP_FUNCTION(ldap_set_option) if (ldap_set_option(ldap, LDAP_OPT_NETWORK_TIMEOUT, (void *) &timeout)) { RETURN_FALSE; } -# elif defined(LDAP_X_OPT_CONNECT_TIMEOUT) + } break; +#elif defined(LDAP_X_OPT_CONNECT_TIMEOUT) + case LDAP_X_OPT_CONNECT_TIMEOUT: + { int timeout; convert_to_long_ex(newval); - timeou = 1000 * Z_LVAL_PP(newval); /* Convert to milliseconds */ + timeout = 1000 * Z_LVAL_PP(newval); /* Convert to milliseconds */ if (ldap_set_option(ldap, LDAP_X_OPT_CONNECT_TIMEOUT, &timeout)) { RETURN_FALSE; } -# endif } break; #endif /* options with string value */ |