applied the patch gcc-maybe-uninitialized-warning.patch for nginx to fix a gcc warning with gcc 4.7.3/4.7.2.

This commit is contained in:
agentzh (Yichun Zhang) 2013-06-11 13:05:30 -07:00
parent c312ba38b3
commit 4cdd11476b
2 changed files with 15 additions and 0 deletions

View File

@ -0,0 +1,11 @@
--- nginx-1.4.1/src/http/ngx_http_request.c 2013-05-06 03:26:50.000000000 -0700
+++ nginx-1.4.1-patched/src/http/ngx_http_request.c 2013-06-11 12:59:48.008321688 -0700
@@ -1951,7 +1951,7 @@
ngx_int_t rc;
ngx_http_connection_t *hc;
ngx_http_core_loc_conf_t *clcf;
- ngx_http_core_srv_conf_t *cscf;
+ ngx_http_core_srv_conf_t *cscf = NULL;
hc = r->http_connection;

View File

@ -157,6 +157,10 @@ echo "$info_txt applying patches/nginx-$main_ver-invalid_referer_hash.patch for
patch -p1 < $root/patches/nginx-$main_ver-invalid_referer_hash.patch || exit 1
echo
echo "$info_txt applying patches/nginx-$main_ver-gcc-maybe-uninitialized-warning.patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-gcc-maybe-uninitialized-warning.patch
echo
rm -f *.patch || exit 1
cd .. || exit 1