Permalink
Browse files

Merge pull request #11 from gtkforphp/compiler_warnings

Compiler warnings
  • Loading branch information...
auroraeosrose committed Oct 18, 2014
2 parents f67dbb5 + f2f1f14 commit a478ba2b1c7eab754dcefdf60c08d7b84cc663d6
Showing with 24 additions and 4 deletions.
  1. +2 −2 cairo.c
  2. +2 −0 cairo_context.c
  3. +2 −0 cairo_font_face.c
  4. +2 −0 cairo_font_options.c
  5. +3 −1 cairo_ft_font.c
  6. +2 −0 cairo_matrix.c
  7. +2 −0 cairo_path.c
  8. +2 −0 cairo_pattern.c
  9. +2 −0 cairo_scaled_font.c
  10. +2 −0 cairo_surface.c
  11. +3 −1 cairo_win32_font.c
View
@@ -612,8 +612,8 @@ ZEND_END_ARG_INFO()
#if defined(CAIRO_HAS_FT_FONT) && defined(HAVE_FREETYPE)
const char* php_cairo_get_ft_error(int error TSRMLS_DC) {
int i;
php_cairo_ft_error *current_error = php_cairo_ft_errors;
const php_cairo_ft_error *current_error = php_cairo_ft_errors;
while (current_error->err_msg != NULL) {
if (current_error->err_code == error) {
View
@@ -2974,7 +2974,9 @@ static zend_object_value cairo_context_object_new(zend_class_entry *ce TSRMLS_DC
{
zend_object_value retval;
cairo_context_object *context;
#if PHP_VERSION_ID < 50399
zval *temp;
#endif
context = ecalloc(1, sizeof(cairo_context_object));
View
@@ -113,7 +113,9 @@ zend_object_value cairo_font_face_object_new(zend_class_entry *ce TSRMLS_DC)
{
zend_object_value retval;
cairo_font_face_object *font_face;
#if PHP_VERSION_ID < 50399
zval *temp;
#endif
font_face = ecalloc(1, sizeof(cairo_font_face_object));
View
@@ -71,7 +71,9 @@ static zend_object_value cairo_font_options_object_new(zend_class_entry *ce TSRM
{
zend_object_value retval;
cairo_font_options_object *font_options;
#if PHP_VERSION_ID < 50399
zval *temp;
#endif
font_options = ecalloc(1, sizeof(cairo_font_options_object));
font_options->font_options = NULL;
View
@@ -200,7 +200,7 @@ PHP_FUNCTION(cairo_ft_font_face_create)
error = php_cairo_create_ft_font_face(font_face_object, stream, owned_stream, load_flags, 0 TSRMLS_CC);
if (error) {
char *err_string = php_cairo_get_ft_error(error TSRMLS_CC);
const char *err_string = php_cairo_get_ft_error(error TSRMLS_CC);
zend_error(E_WARNING, "cairo_ft_font_face_create(): An error occurred opening the file: %s", err_string);
RETURN_NULL();
}
@@ -325,7 +325,9 @@ zend_object_value cairo_ft_font_face_object_new(zend_class_entry *ce TSRMLS_DC)
{
zend_object_value retval;
cairo_ft_font_face_object *font_face;
#if PHP_VERSION_ID < 50399
zval *temp;
#endif
font_face = ecalloc(1, sizeof(cairo_ft_font_face_object));
font_face->ft_stream = NULL;
View
@@ -520,7 +520,9 @@ static zend_object_value cairo_matrix_object_new(zend_class_entry *ce TSRMLS_DC)
{
zend_object_value retval;
cairo_matrix_object *matrix;
#if PHP_VERSION_ID < 50399
zval *temp;
#endif
matrix = ecalloc(1, sizeof(cairo_matrix_object));
View
@@ -42,7 +42,9 @@ static zend_object_value cairo_path_object_new(zend_class_entry *ce TSRMLS_DC)
{
zend_object_value retval;
cairo_path_object *path;
#if PHP_VERSION_ID < 50399
zval *temp;
#endif
path = ecalloc(1, sizeof(cairo_path_object));
View
@@ -931,7 +931,9 @@ static zend_object_value cairo_pattern_object_new(zend_class_entry *ce TSRMLS_DC
{
zend_object_value retval;
cairo_pattern_object *pattern;
#if PHP_VERSION_ID < 50399
zval *temp;
#endif
pattern = ecalloc(1, sizeof(cairo_pattern_object));
View
@@ -513,7 +513,9 @@ static zend_object_value cairo_scaled_font_object_new(zend_class_entry *ce TSRML
{
zend_object_value retval;
cairo_scaled_font_object *scaled_font;
#if PHP_VERSION_ID < 50399
zval *temp;
#endif
scaled_font = ecalloc(1, sizeof(cairo_scaled_font_object));
View
@@ -599,7 +599,9 @@ zend_object_value cairo_surface_object_new(zend_class_entry *ce TSRMLS_DC)
{
zend_object_value retval;
cairo_surface_object *surface;
#if PHP_VERSION_ID < 50399
zval *temp;
#endif
surface = ecalloc(1, sizeof(cairo_surface_object));
View
@@ -274,7 +274,9 @@ zend_object_value cairo_win32_font_face_create_new(zend_class_entry *ce TSRMLS_D
{
zend_object_value retval;
cairo_win32_font_face_object *font_face;
zval *temp;
#if PHP_VERSION_ID < 50399
zval *temp;
#endif
font_face = ecalloc(1, sizeof(cairo_win32_font_face_object));
font_face->std.ce = ce;

0 comments on commit a478ba2

Please sign in to comment.