diff options
| author | Anatol Belski <ab@php.net> | 2013-12-14 20:47:37 +0100 | 
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-12-14 20:47:37 +0100 | 
| commit | 904721189ff949c67795ec418f04b67951cbd57b (patch) | |
| tree | 06b7d04ffd09f1d66fa0481e9a4a5ff1ab35c3b1 /ext | |
| parent | 41eaac3491cfcad02ebab5f86ece018d9e3c4cc6 (diff) | |
| parent | 509a67d28f792a2a11f86a3aca4a5ac820d2f747 (diff) | |
| download | php-git-904721189ff949c67795ec418f04b67951cbd57b.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/snmp/snmp.c | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index 4e2510afc8..217606aee3 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -533,7 +533,7 @@ static void php_snmp_error(zval *object, const char *docref TSRMLS_DC, int type,  	}  	if (object && (snmp_object->exceptions_enabled & type)) { -		zend_throw_exception_ex(php_snmp_exception_ce, type, snmp_object->snmp_errstr TSRMLS_CC); +		zend_throw_exception_ex(php_snmp_exception_ce, type TSRMLS_CC, snmp_object->snmp_errstr);  	} else {  		va_start(args, format);  		php_verror(docref, "", E_WARNING, format, args TSRMLS_CC); | 
