id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-14 22:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cinematic.cpp: Revert removal of void from METHODDEF(void), etc.

Browse source 
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.
This commit is contained in:
Richard Tollerton 2022-10-22 13:53:11 -05:00
parent a7322c1131
commit bc8882b8a2
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
neo/renderer/Cinematic.cpp
View file

@ -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