Index: ext/gd/libgd/gd_arc.c --- ext/gd/libgd/gd_arc.c.orig 2009-05-26 22:14:31 +0200 +++ ext/gd/libgd/gd_arc.c 2009-07-01 08:56:12 +0200 @@ -53,6 +53,7 @@ } } +#if 0 void gdImageFilledEllipse (gdImagePtr im, int mx, int my, int w, int h, int c) { int x=0,mx1=0,mx2=0,my1=0,my2=0; @@ -106,5 +107,6 @@ old_y1 = my1; } } +#endif Index: ext/gd/libgd/gd_compat.c --- ext/gd/libgd/gd_compat.c.orig 2009-08-09 15:15:45 +0200 +++ ext/gd/libgd/gd_compat.c 2010-01-19 21:20:30 +0100 @@ -5,6 +5,7 @@ #endif #ifdef HAVE_GD_JPG +# include # include #endif Index: ext/pcre/php_pcre.c --- ext/pcre/php_pcre.c.orig 2012-01-01 14:15:04.000000000 +0100 +++ ext/pcre/php_pcre.c 2012-02-06 08:48:07.000000000 +0100 @@ -247,6 +247,7 @@ #endif pcre_cache_entry *pce; pcre_cache_entry new_entry; + int dummy; /* Try to lookup the cached regex entry, and if successful, just pass back the compiled pattern, otherwise go on and compile it. */ @@ -255,7 +256,7 @@ * We use a quick pcre_info() check to see whether cache is corrupted, and if it * is, we flush it and compile the pattern from scratch. */ - if (pcre_info(pce->re, NULL, NULL) == PCRE_ERROR_BADMAGIC) { + if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &dummy) == PCRE_ERROR_BADMAGIC) { zend_hash_clean(&PCRE_G(pcre_cache)); } else { #if HAVE_SETLOCALE