The Independent JPEG Group's JPEG software v6a
diff --git a/wrbmp.c b/wrbmp.c
index fa144fc..3283b0f 100644
--- a/wrbmp.c
+++ b/wrbmp.c
@@ -1,7 +1,7 @@
/*
* wrbmp.c
*
- * Copyright (C) 1994-1995, Thomas G. Lane.
+ * Copyright (C) 1994-1996, Thomas G. Lane.
* This file is part of the Independent JPEG Group's software.
* For conditions of distribution and use, see the accompanying README file.
*
@@ -57,7 +57,7 @@
/* Forward declarations */
-LOCAL void write_colormap
+LOCAL(void) write_colormap
JPP((j_decompress_ptr cinfo, bmp_dest_ptr dest,
int map_colors, int map_entry_size));
@@ -67,7 +67,7 @@
* In this module rows_supplied will always be 1.
*/
-METHODDEF void
+METHODDEF(void)
put_pixel_rows (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
JDIMENSION rows_supplied)
/* This version is for writing 24-bit pixels */
@@ -102,7 +102,7 @@
*outptr++ = 0;
}
-METHODDEF void
+METHODDEF(void)
put_gray_rows (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
JDIMENSION rows_supplied)
/* This version is for grayscale OR quantized color output */
@@ -138,7 +138,7 @@
* In this module we may as well postpone everything until finish_output.
*/
-METHODDEF void
+METHODDEF(void)
start_output_bmp (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
{
/* no work here */
@@ -153,7 +153,7 @@
* First, routines to write the Windows and OS/2 variants of the file header.
*/
-LOCAL void
+LOCAL(void)
write_bmp_header (j_decompress_ptr cinfo, bmp_dest_ptr dest)
/* Write a Windows-style BMP file header, including colormap if needed */
{
@@ -226,7 +226,7 @@
}
-LOCAL void
+LOCAL(void)
write_os2_header (j_decompress_ptr cinfo, bmp_dest_ptr dest)
/* Write an OS2-style BMP file header, including colormap if needed */
{
@@ -288,7 +288,7 @@
* Windows uses BGR0 map entries; OS/2 uses BGR entries.
*/
-LOCAL void
+LOCAL(void)
write_colormap (j_decompress_ptr cinfo, bmp_dest_ptr dest,
int map_colors, int map_entry_size)
{
@@ -340,7 +340,7 @@
}
-METHODDEF void
+METHODDEF(void)
finish_output_bmp (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
{
bmp_dest_ptr dest = (bmp_dest_ptr) dinfo;
@@ -386,7 +386,7 @@
* The module selection routine for BMP format output.
*/
-GLOBAL djpeg_dest_ptr
+GLOBAL(djpeg_dest_ptr)
jinit_write_bmp (j_decompress_ptr cinfo, boolean is_os2)
{
bmp_dest_ptr dest;