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

1 files changed, 54 insertions, 65 deletions

diff --git a/jsimddct.h b/jsimddct.h
index 928d6d3..aa421fb 100644
--- a/jsimddct.h
+++ b/jsimddct.h
@@ -9,77 +9,66 @@
  *
  */
 
-EXTERN(int) jsimd_can_convsamp JPP((void));
-EXTERN(int) jsimd_can_convsamp_float JPP((void));
+EXTERN(int) jsimd_can_convsamp (void);
+EXTERN(int) jsimd_can_convsamp_float (void);
 
-EXTERN(void) jsimd_convsamp JPP((JSAMPARRAY sample_data,
-                                 JDIMENSION start_col,
-                                 DCTELEM * workspace));
-EXTERN(void) jsimd_convsamp_float JPP((JSAMPARRAY sample_data,
-                                       JDIMENSION start_col,
-                                       FAST_FLOAT * workspace));
+EXTERN(void) jsimd_convsamp (JSAMPARRAY sample_data, JDIMENSION start_col,
+                             DCTELEM * workspace);
+EXTERN(void) jsimd_convsamp_float (JSAMPARRAY sample_data,
+                                   JDIMENSION start_col,
+                                   FAST_FLOAT * workspace);
 
-EXTERN(int) jsimd_can_fdct_islow JPP((void));
-EXTERN(int) jsimd_can_fdct_ifast JPP((void));
-EXTERN(int) jsimd_can_fdct_float JPP((void));
+EXTERN(int) jsimd_can_fdct_islow (void);
+EXTERN(int) jsimd_can_fdct_ifast (void);
+EXTERN(int) jsimd_can_fdct_float (void);
 
-EXTERN(void) jsimd_fdct_islow JPP((DCTELEM * data));
-EXTERN(void) jsimd_fdct_ifast JPP((DCTELEM * data));
-EXTERN(void) jsimd_fdct_float JPP((FAST_FLOAT * data));
+EXTERN(void) jsimd_fdct_islow (DCTELEM * data);
+EXTERN(void) jsimd_fdct_ifast (DCTELEM * data);
+EXTERN(void) jsimd_fdct_float (FAST_FLOAT * data);
 
-EXTERN(int) jsimd_can_quantize JPP((void));
-EXTERN(int) jsimd_can_quantize_float JPP((void));
+EXTERN(int) jsimd_can_quantize (void);
+EXTERN(int) jsimd_can_quantize_float (void);
 
-EXTERN(void) jsimd_quantize JPP((JCOEFPTR coef_block,
-                                 DCTELEM * divisors,
-                                 DCTELEM * workspace));
-EXTERN(void) jsimd_quantize_float JPP((JCOEFPTR coef_block,
-                                       FAST_FLOAT * divisors,
-                                       FAST_FLOAT * workspace));
+EXTERN(void) jsimd_quantize (JCOEFPTR coef_block, DCTELEM * divisors,
+                             DCTELEM * workspace);
+EXTERN(void) jsimd_quantize_float (JCOEFPTR coef_block, FAST_FLOAT * divisors,
+                                   FAST_FLOAT * workspace);
 
-EXTERN(int) jsimd_can_idct_2x2 JPP((void));
-EXTERN(int) jsimd_can_idct_4x4 JPP((void));
-EXTERN(int) jsimd_can_idct_6x6 JPP((void));
-EXTERN(int) jsimd_can_idct_12x12 JPP((void));
+EXTERN(int) jsimd_can_idct_2x2 (void);
+EXTERN(int) jsimd_can_idct_4x4 (void);
+EXTERN(int) jsimd_can_idct_6x6 (void);
+EXTERN(int) jsimd_can_idct_12x12 (void);
 
-EXTERN(void) jsimd_idct_2x2 JPP((j_decompress_ptr cinfo,
-                                 jpeg_component_info * compptr,
-                                 JCOEFPTR coef_block,
-                                 JSAMPARRAY output_buf,
-                                 JDIMENSION output_col));
-EXTERN(void) jsimd_idct_4x4 JPP((j_decompress_ptr cinfo,
-                                 jpeg_component_info * compptr,
-                                 JCOEFPTR coef_block,
-                                 JSAMPARRAY output_buf,
-                                 JDIMENSION output_col));
-EXTERN(void) jsimd_idct_6x6 JPP((j_decompress_ptr cinfo,
-                                 jpeg_component_info * compptr,
-                                 JCOEFPTR coef_block,
-                                 JSAMPARRAY output_buf,
-                                 JDIMENSION output_col));
-EXTERN(void) jsimd_idct_12x12 JPP((j_decompress_ptr cinfo,
-                                   jpeg_component_info * compptr,
-                                   JCOEFPTR coef_block,
-                                   JSAMPARRAY output_buf,
-                                   JDIMENSION output_col));
+EXTERN(void) jsimd_idct_2x2 (j_decompress_ptr cinfo,
+                             jpeg_component_info * compptr,
+                             JCOEFPTR coef_block, JSAMPARRAY output_buf,
+                             JDIMENSION output_col);
+EXTERN(void) jsimd_idct_4x4 (j_decompress_ptr cinfo,
+                             jpeg_component_info * compptr,
+                             JCOEFPTR coef_block, JSAMPARRAY output_buf,
+                             JDIMENSION output_col);
+EXTERN(void) jsimd_idct_6x6 (j_decompress_ptr cinfo,
+                             jpeg_component_info * compptr,
+                             JCOEFPTR coef_block, JSAMPARRAY output_buf,
+                             JDIMENSION output_col);
+EXTERN(void) jsimd_idct_12x12 (j_decompress_ptr cinfo,
+                               jpeg_component_info * compptr,
+                               JCOEFPTR coef_block, JSAMPARRAY output_buf,
+                               JDIMENSION output_col);
 
-EXTERN(int) jsimd_can_idct_islow JPP((void));
-EXTERN(int) jsimd_can_idct_ifast JPP((void));
-EXTERN(int) jsimd_can_idct_float JPP((void));
-
-EXTERN(void) jsimd_idct_islow JPP((j_decompress_ptr cinfo,
-                                   jpeg_component_info * compptr,
-                                   JCOEFPTR coef_block,
-                                   JSAMPARRAY output_buf,
-                                   JDIMENSION output_col));
-EXTERN(void) jsimd_idct_ifast JPP((j_decompress_ptr cinfo,
-                                   jpeg_component_info * compptr,
-                                   JCOEFPTR coef_block,
-                                   JSAMPARRAY output_buf,
-                                   JDIMENSION output_col));
-EXTERN(void) jsimd_idct_float JPP((j_decompress_ptr cinfo,
-                                   jpeg_component_info * compptr,
-                                   JCOEFPTR coef_block,
-                                   JSAMPARRAY output_buf,
-                                   JDIMENSION output_col));
+EXTERN(int) jsimd_can_idct_islow (void);
+EXTERN(int) jsimd_can_idct_ifast (void);
+EXTERN(int) jsimd_can_idct_float (void);
 
+EXTERN(void) jsimd_idct_islow (j_decompress_ptr cinfo,
+                               jpeg_component_info * compptr,
+                               JCOEFPTR coef_block, JSAMPARRAY output_buf,
+                               JDIMENSION output_col);
+EXTERN(void) jsimd_idct_ifast (j_decompress_ptr cinfo,
+                               jpeg_component_info * compptr,
+                               JCOEFPTR coef_block, JSAMPARRAY output_buf,
+                               JDIMENSION output_col);
+EXTERN(void) jsimd_idct_float (j_decompress_ptr cinfo,
+                               jpeg_component_info * compptr,
+                               JCOEFPTR coef_block, JSAMPARRAY output_buf,
+                               JDIMENSION output_col);