diff options
Diffstat (limited to 'ext/snmp')
| -rw-r--r-- | ext/snmp/config.m4 | 4 | ||||
| -rw-r--r-- | ext/snmp/php_snmp.h | 8 | ||||
| -rw-r--r-- | ext/snmp/snmp.c | 10 | ||||
| -rw-r--r-- | ext/snmp/winsnmp.c | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/ext/snmp/config.m4 b/ext/snmp/config.m4 index 511246b48..f42541d63 100644 --- a/ext/snmp/config.m4 +++ b/ext/snmp/config.m4 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.32 2005/05/29 23:16:44 sniper Exp $ +dnl $Id: config.m4,v 1.32.2.1 2005/11/29 18:26:00 tony2001 Exp $ dnl PHP_ARG_WITH(snmp,for SNMP support, @@ -46,7 +46,7 @@ if test "$PHP_SNMP" != "no"; then test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp done for i in /usr /usr/snmp /usr/local /usr/local/snmp; do - test -f $i/lib/libsnmp.a -o -f $i/lib/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i/lib + test -f $i/lib/libsnmp.a || test -f $i/lib/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i/lib done else SNMP_INCDIR=$PHP_SNMP/include diff --git a/ext/snmp/php_snmp.h b/ext/snmp/php_snmp.h index 0013fa91a..f362c2fdb 100644 --- a/ext/snmp/php_snmp.h +++ b/ext/snmp/php_snmp.h @@ -2,12 +2,12 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2005 The PHP Group | + | Copyright (c) 1997-2006 The PHP Group | +----------------------------------------------------------------------+ - | This source file is subject to version 3.0 of the PHP license, | + | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_0.txt. | + | http://www.php.net/license/3_01.txt | | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_snmp.h,v 1.25 2005/08/03 14:07:46 sniper Exp $ */ +/* $Id: php_snmp.h,v 1.25.2.1 2006/01/01 12:50:13 sniper Exp $ */ #ifndef PHP_SNMP_H #define PHP_SNMP_H diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index a732c1773..63c32d8ca 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -2,12 +2,12 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2005 The PHP Group | + | Copyright (c) 1997-2006 The PHP Group | +----------------------------------------------------------------------+ - | This source file is subject to version 3.0 of the PHP license, | + | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_0.txt. | + | http://www.php.net/license/3_01.txt | | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: snmp.c,v 1.106 2005/08/03 14:07:46 sniper Exp $ */ +/* $Id: snmp.c,v 1.106.2.2 2006/01/01 12:50:13 sniper Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -113,7 +113,7 @@ static oid objid_mib[] = {1, 3, 6, 1, 2, 1}; /* {{{ snmp_functions[] */ -function_entry snmp_functions[] = { +zend_function_entry snmp_functions[] = { PHP_FE(snmpget, NULL) PHP_FE(snmpgetnext, NULL) PHP_FE(snmpwalk, NULL) diff --git a/ext/snmp/winsnmp.c b/ext/snmp/winsnmp.c index f4332300a..7aa4866d4 100644 --- a/ext/snmp/winsnmp.c +++ b/ext/snmp/winsnmp.c @@ -21,7 +21,7 @@ Created from the snmputil sample in the Microsoft SDK for NT /* {{{ snmp_functions[] */ -function_entry snmp_functions[] = { +zend_function_entry snmp_functions[] = { {"snmpget", php3_snmpget, NULL}, {"snmpwalk", php3_snmpwalk, NULL}, {NULL,NULL,NULL} @@ -58,7 +58,7 @@ DLEXPORT zend_module_entry *get_module() { return &snmp_module_entry; } /* {{{ _php_snmp */ void _php_snmp(INTERNAL_FUNCTION_PARAMETERS, int st) { - pval *a1, *a2, *a3; + zval *a1, *a2, *a3; INT operation; LPSTR agent; LPSTR community; |