Merge pull request #967 from sjinks/compiler-warnings

[1.2.2] Fix all compiler warnings
phalcon · Aug 1, 2013 · b04d46b · b04d46b
2 parents fdff06d + e740ecb
commit b04d46b
Show file tree

Hide file tree

Showing 13 changed files with 211,915 additions and 211,766 deletions.
diff --git a/build/32bits/phalcon.c b/build/32bits/phalcon.c
diff --git a/build/32bits/phalcon.h b/build/32bits/phalcon.h
@@ -10175,7 +10175,6 @@ zend_class_entry *phalcon_escaper_exception_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Escaper_Exception);
 
-
 zend_class_entry *phalcon_assets_manager_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Assets_Manager);
@@ -10248,6 +10247,7 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_assets_manager_output, 0, 0, 2)
 	ZEND_ARG_INFO(0, collection)
 	ZEND_ARG_INFO(0, callback)
+	ZEND_ARG_INFO(0, type)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_assets_manager_outputcss, 0, 0, 0)