Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compiler warnings #801

Merged
merged 3 commits into from Jul 8, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ext/cache/backend/apc.c
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,7 @@ PHP_METHOD(Phalcon_Cache_Backend_Apc, delete){
PHP_METHOD(Phalcon_Cache_Backend_Apc, queryKeys){

zval *prefix = NULL, *keys, *type, *prefix_pattern, *iterator;
zval *key = NULL, *real_key = NULL;
zval *r0 = NULL;
zval *key = NULL;
zend_class_entry *ce0;
#if PHP_VERSION_ID < 50500
char *str_key;
Expand Down
2 changes: 1 addition & 1 deletion ext/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ static void array_merge_recursive_n(zval **a1, zval *a2 TSRMLS_DC)
PHP_METHOD(Phalcon_Config, merge){

zval *config, *array_config, *value = NULL, *key = NULL, *active_value = NULL;
zval *other_array = NULL, *tmp = NULL;
zval *other_array = NULL;
HashTable *ah0;
HashPosition hp0;
zval **hd;
Expand Down
6 changes: 6 additions & 0 deletions scripts/gen-build.php
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ public function generate($path, $destination='build/', $calculateHashKeys=false)
#include "ext/standard/base64.h"
#include "ext/standard/md5.h"
#include "ext/standard/head.h"
#include "ext/standard/url.h"
#include "ext/spl/spl_heap.h"

#if HAVE_BUNDLED_PCRE
Expand Down Expand Up @@ -571,6 +572,11 @@ private function _checkHeaders($path)
continue;
}

if (strpos($line, 'ext/') !== false) {
//echo $line, PHP_EOL;
continue;
}

if (strpos($line, 'kernel/') !== false) {
//echo $line, PHP_EOL;
continue;
Expand Down