← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/php5/gutsy

« back to all changes in this revision

Viewing changes to Zend/zend_interfaces.c

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2007-06-11 20:32:54 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20070611203254-b4k8nggrm5vxul1j
Tags: 5.2.3-1ubuntu1
* Merge from debian unstable, remaining changes:
 - debian/changelog: Add some missing CVEs.
 - debian/control: DebianMaintainerField
 - debian/control, debian/rules: Disable a few build dependencies and
   accompanying binary packages which we do not want to support in main:
   + firebird2-dev/php5-interbase (we have a separate php-interbase source)
   + libc-client-dev/php5-imap (we have a separate php-imap source)
   + libmcrypt-dev/php5-mcrypt (separate php-mcrypt source)

Show diffs side-by-side

added added

removed removed

Lines of Context:
Zend/zend_interfaces.c
16
16
   +----------------------------------------------------------------------+
17
17
*/
18
18
 
19
 
/* $Id: zend_interfaces.c,v 1.33.2.4.2.5 2007/01/01 09:35:46 sebastian Exp $ */
 
19
/* $Id: zend_interfaces.c,v 1.33.2.4.2.6 2007/05/30 16:32:02 tony2001 Exp $ */
20
20
 
21
21
#include "zend.h"
22
22
#include "zend_API.h"
496
496
static
497
497
ZEND_BEGIN_ARG_INFO_EX(arginfo_arrayaccess_offset, 0, 0, 1)
498
498
        ZEND_ARG_INFO(0, offset)
499
 
ZEND_END_ARG_INFO();
 
499
ZEND_END_ARG_INFO()
500
500
 
501
501
static
502
502
ZEND_BEGIN_ARG_INFO_EX(arginfo_arrayaccess_offset_get, 0, 0, 1) /* actually this should be return by ref but atm cannot be */
503
503
        ZEND_ARG_INFO(0, offset)
504
 
ZEND_END_ARG_INFO();
 
504
ZEND_END_ARG_INFO()
505
505
 
506
506
static
507
507
ZEND_BEGIN_ARG_INFO_EX(arginfo_arrayaccess_offset_value, 0, 0, 2)
508
508
        ZEND_ARG_INFO(0, offset)
509
509
        ZEND_ARG_INFO(0, value)
510
 
ZEND_END_ARG_INFO();
 
510
ZEND_END_ARG_INFO()
511
511
 
512
512
zend_function_entry zend_funcs_arrayaccess[] = {
513
513
        ZEND_ABSTRACT_ME(arrayaccess, offsetExists, arginfo_arrayaccess_offset)
520
520
static
521
521
ZEND_BEGIN_ARG_INFO(arginfo_serializable_serialize, 0)
522
522
        ZEND_ARG_INFO(0, serialized)
523
 
ZEND_END_ARG_INFO();
 
523
ZEND_END_ARG_INFO()
524
524
 
525
525
zend_function_entry zend_funcs_serializable[] = {
526
526
        ZEND_ABSTRACT_ME(serializable, serialize,   NULL)