- Fix build with php 5.3

PR:		ports/145653
Submitted by:	Joe Horn <joehorn@gmail.com> (maintainer)
This commit is contained in:
Pav Lucistnik 2010-04-12 13:56:14 +00:00
parent a30025fa72
commit 49812c9408
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=252595
3 changed files with 32 additions and 1 deletions

View file

@ -7,6 +7,7 @@
PORTNAME= adodb-ext
PORTVERSION= 5.04
PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= http://phplens.com/lens/dl/
PKGNAMEPREFIX= php-
@ -20,11 +21,13 @@ WRKSRC= ${WRKDIR}/adodb-${PORTVERSION:S/.//}
USE_PHP= yes
USE_PHPIZE= yes
USE_ZIP= yes
DEFAULT_PHP_VER= 5
CONFIGURE_ARGS= --with-php-config=${PREFIX}/bin/php-config \
--prefix=${PREFIX}/lib/php/${PHP_EXT_DIR}
SUB_FILES= pkg-message
PLIST_SUB= PHP_EXT_DIR=${PHP_EXT_DIR}
USE_DOS2UNIX= yes
post-install:
@${CAT} ${PKGMESSAGE}

View file

@ -0,0 +1,28 @@
--- adodb.c.orig 2010-04-12 20:00:43.000000000 +0800
+++ adodb.c 2010-04-12 20:05:20.000000000 +0800
@@ -159,11 +159,11 @@
static void adodb_init_zval(zval *v, char *s)
{
- v->type = IS_STRING;
- v->value.str.val = s;
- v->value.str.len = strlen(s);
- v->is_ref = 0;
- v->refcount = 1;
+ Z_TYPE_P(v) = IS_STRING;
+ Z_STRVAL_P(v) = s;
+ Z_STRLEN_P(v) = strlen(s);
+ Z_UNSET_ISREF_P(v);
+ Z_SET_REFCOUNT_P(v, 1);
}
/* {{{ PHP_MINIT_FUNCTION
@@ -277,7 +277,7 @@
fci.function_table = EG(function_table);
fci.function_name = &adodb_zvals[zval_ocifetch];
fci.symbol_table = NULL;
- fci.object_pp = NULL;
+ fci.object_ptr = NULL;
fci.retval_ptr_ptr = &retval;
fci.param_count = 2;
fci.params = &params[1];