From bc8882b8a2d3b170ad152190a0448915f698dd0c Mon Sep 17 00:00:00 2001 From: Richard Tollerton Date: Sat, 22 Oct 2022 13:53:11 -0500 Subject: [PATCH] Cinematic.cpp: Revert removal of void from METHODDEF(void), etc. In fd6c589d, all instances of (void) were replaced by (). However, the libjpeg defines `METHODDEF`, `LOCAL`, `GLOBAL`, and `EXTERN` (see `jmorecfg.h`) are occasionally used in code as if they are functions: ``` METHODDEF(void) METHODDEF void init_source( j_decompress_ptr cinfo ) ``` fd6c589d therefore breaks these builds when `USE_NEWER_JPEG` is defined, because several function definitions are missing return types. --- neo/renderer/Cinematic.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neo/renderer/Cinematic.cpp b/neo/renderer/Cinematic.cpp index a9f2b6ae..761bf4ad 100644 --- a/neo/renderer/Cinematic.cpp +++ b/neo/renderer/Cinematic.cpp @@ -2808,7 +2808,7 @@ fill_input_buffer( j_decompress_ptr cinfo ) */ #ifdef USE_NEWER_JPEG - METHODDEF() + METHODDEF(void) #else METHODDEF void #endif @@ -2836,7 +2836,7 @@ init_source( j_decompress_ptr cinfo ) */ #ifdef USE_NEWER_JPEG - METHODDEF() + METHODDEF(void) #else METHODDEF void #endif @@ -2876,7 +2876,7 @@ skip_input_data( j_decompress_ptr cinfo, long num_bytes ) */ #ifdef USE_NEWER_JPEG - METHODDEF() + METHODDEF(void) #else METHODDEF void #endif @@ -2887,7 +2887,7 @@ term_source( j_decompress_ptr cinfo ) } #ifdef USE_NEWER_JPEG - GLOBAL() + GLOBAL(void) #else GLOBAL void #endif