Skip to content

Commit b143931

Browse files
committed
Fix [-Wstrict-prototypes] in GD extension .c files
1 parent 304d810 commit b143931

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

ext/gd/gd.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,12 @@ static void php_image_filter_pixelate(INTERNAL_FUNCTION_PARAMETERS);
132132
static void php_image_filter_scatter(INTERNAL_FUNCTION_PARAMETERS);
133133

134134
/* End Section filters declarations */
135-
static gdImagePtr _php_image_create_from_string(zend_string *Data, char *tn, gdImagePtr (*ioctx_func_p)());
136-
static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, gdImagePtr (*func_p)(), gdImagePtr (*ioctx_func_p)());
135+
static gdImagePtr _php_image_create_from_string(zend_string *Data, char *tn, gdImagePtr (*ioctx_func_p)(gdIOCtx * infile));
136+
static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, gdImagePtr (*func_p)(), gdImagePtr (*ioctx_func_p)(gdIOCtx * infile));
137137
static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, void (*func_p)());
138138
static gdIOCtx *create_stream_context_from_zval(zval *to_zval);
139139
static gdIOCtx *create_stream_context(php_stream *stream, int close_stream);
140-
static gdIOCtx *create_output_context();
140+
static gdIOCtx *create_output_context(void);
141141
static int _php_image_type(char data[12]);
142142

143143
/* output streaming (formerly gd_ctx.c) */
@@ -217,7 +217,7 @@ void php_gd_assign_libgdimageptr_as_extgdimage(zval *val, gdImagePtr image)
217217
php_gd_exgdimage_from_zobj_p(Z_OBJ_P(val))->image = image;
218218
}
219219

220-
static void php_gd_object_minit_helper()
220+
static void php_gd_object_minit_helper(void)
221221
{
222222
zend_class_entry ce;
223223
INIT_CLASS_ENTRY(ce, "GdImage", class_GdImage_methods);
@@ -1446,7 +1446,7 @@ static int _php_image_type (char data[12])
14461446
/* }}} */
14471447

14481448
/* {{{ _php_image_create_from_string */
1449-
gdImagePtr _php_image_create_from_string(zend_string *data, char *tn, gdImagePtr (*ioctx_func_p)())
1449+
gdImagePtr _php_image_create_from_string(zend_string *data, char *tn, gdImagePtr (*ioctx_func_p)(gdIOCtx * infile))
14501450
{
14511451
gdImagePtr im;
14521452
gdIOCtx *io_ctx;
@@ -1550,7 +1550,7 @@ PHP_FUNCTION(imagecreatefromstring)
15501550
/* }}} */
15511551

15521552
/* {{{ _php_image_create_from */
1553-
static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, gdImagePtr (*func_p)(), gdImagePtr (*ioctx_func_p)())
1553+
static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, gdImagePtr (*func_p)(), gdImagePtr (*ioctx_func_p)(gdIOCtx * infile))
15541554
{
15551555
char *file;
15561556
size_t file_len;

ext/gd/libgd/gdft.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,7 @@ void gdFontCacheShutdown()
774774
gdMutexUnlock(gdFontCacheMutex);
775775
}
776776

777-
void gdFreeFontCache()
777+
void gdFreeFontCache(void)
778778
{
779779
gdFontCacheShutdown();
780780
}

0 commit comments

Comments
 (0)