From: Ferenc Kovacs <tyra3l@gmail.com>
Date: Fri, 6 Dec 2013 04:39:49 +0000 (+0100)
Subject: Merge branch 'use-function' of git://github.com/igorw/php-src into igorw-use-function
X-Git-Tag: php-5.6.0alpha1~139^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=562fa252ad932f321131ab6f65ffaef8d62fc73a;p=php

Merge branch 'use-function' of git://github.com/igorw/php-src into igorw-use-function
---

562fa252ad932f321131ab6f65ffaef8d62fc73a
diff --cc Zend/zend_compile.h
index 5ffd6b4855,c1a8e6fcaf..e3f06a0012
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@@ -642,8 -639,10 +644,11 @@@ void zend_do_begin_namespace(const znod
  void zend_do_end_namespace(TSRMLS_D);
  void zend_verify_namespace(TSRMLS_D);
  void zend_do_use(znode *name, znode *new_name, int is_global TSRMLS_DC);
+ void zend_do_use_non_class(znode *ns_name, znode *new_name, int is_global, int is_function, zend_bool case_sensitive, HashTable *current_import_sub, HashTable *lookup_table TSRMLS_DC);
+ void zend_do_use_function(znode *name, znode *new_name, int is_global TSRMLS_DC);
+ void zend_do_use_const(znode *name, znode *new_name, int is_global TSRMLS_DC);
  void zend_do_end_compilation(TSRMLS_D);
 +void zend_do_constant_expression(znode *result, zend_ast *ast TSRMLS_DC);
  
  void zend_do_resolve_class_name(znode *result, znode *class_name, int is_static TSRMLS_DC);