Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'xdebug_2_2'

  • Loading branch information...
commit 6e2969b319c0aa6c512c25a7d21c951c1e56351a 2 parents ff94e4b + e95eb3e
@derickr authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  xdebug_var.c
View
2  xdebug_var.c
@@ -923,7 +923,7 @@ static int object_item_add_zend_prop_to_merged_hash(zend_property_info *zpp XDEB
zend_class_entry *ce;
if ((zpp->flags & ZEND_ACC_STATIC) == 0) {
- return;
+ return 0;
}
merged = va_arg(args, HashTable*);
object_type = va_arg(args, int);
Please sign in to comment.
Something went wrong with that request. Please try again.