aboutsummaryrefslogtreecommitdiff
path: root/jdmerge.c
diff options
context:
space:
mode:
authordcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db>2014-05-16 10:43:44 +0000
committerdcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db>2014-05-16 10:43:44 +0000
commit8bbf7d138a6b6896038c07213ce632a6ccc506e3 (patch)
tree0b9fd4fd9792b427eadbe4b5b7170580b7e90e6c /jdmerge.c
parent2af0178c4650df2f2b6dd8186ac84de275c0bf5c (diff)
Get rid of the HAVE_PROTOTYPES configuration option, as well as the related JMETHOD and JPP macros. libjpeg-turbo has never supported compilers that don't handle prototypes. Doing so requires ansi2knr, which isn't even supported in the IJG code anymore.
git-svn-id: svn://svn.code.sf.net/p/libjpeg-turbo/code/trunk@1308 632fc199-4ca6-4c93-a231-07263d6284db
Diffstat (limited to 'jdmerge.c')
-rw-r--r--jdmerge.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/jdmerge.c b/jdmerge.c
index b82fe47..60d0f5c 100644
--- a/jdmerge.c
+++ b/jdmerge.c
@@ -83,9 +83,8 @@ typedef struct {
struct jpeg_upsampler pub; /* public fields */
/* Pointer to routine to do actual upsampling/conversion of one row group */
- JMETHOD(void, upmethod, (j_decompress_ptr cinfo,
- JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
- JSAMPARRAY output_buf));
+ void (*upmethod) (j_decompress_ptr cinfo, JSAMPIMAGE input_buf,
+ JDIMENSION in_row_group_ctr, JSAMPARRAY output_buf);
/* Private state for YCC->RGB conversion */
int * Cr_r_tab; /* => table for Cr to R conversion */