From b29c4e8120d00c4ce2f19bc2d358213a90d1064d Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sat, 8 Jun 2013 23:35:21 +0000
Subject: [PATCH] Mark bitblt.c functions static

---
 2d/bitblt.c     | 45 +++++++++++++++++++++------------------------
 include/grdef.h |  3 ---
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/2d/bitblt.c b/2d/bitblt.c
index f2a277da0..53824da84 100644
--- a/2d/bitblt.c
+++ b/2d/bitblt.c
@@ -28,22 +28,19 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "ogl_init.h"
 #endif
 
-int gr_bitblt_dest_step_shift = 0;
-int gr_bitblt_double = 0;
-ubyte *gr_bitblt_fade_table=NULL;
+static int gr_bitblt_dest_step_shift = 0;
+static int gr_bitblt_double = 0;
+static ubyte *gr_bitblt_fade_table=NULL;
 
-void gr_bm_ubitblt00_rle(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * src, grs_bitmap * dest);
-void gr_bm_ubitblt00m_rle(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * src, grs_bitmap * dest);
-void gr_bm_ubitblt0x_rle(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * src, grs_bitmap * dest, int masked);
+static void gr_bm_ubitblt00_rle(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * src, grs_bitmap * dest);
+static void gr_bm_ubitblt00m_rle(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * src, grs_bitmap * dest);
+static void gr_bm_ubitblt0x_rle(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * src, grs_bitmap * dest, int masked);
 
-void gr_bm_ubitblt01(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * src, grs_bitmap * dest);
-void gr_bm_ubitblt02(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * src, grs_bitmap * dest);
-
-void gr_linear_movsd( ubyte * source, ubyte * dest, unsigned int nbytes) {
+static void gr_linear_movsd( ubyte * source, ubyte * dest, unsigned int nbytes) {
 	memcpy(dest,source,nbytes);
 }
 
-void gr_linear_rep_movsdm(ubyte *src, ubyte *dest, int num_pixels) {
+static void gr_linear_rep_movsdm(ubyte *src, ubyte *dest, int num_pixels) {
 	register ubyte c;
 	while (num_pixels--)
 		if ((c=*src++)!=255)
@@ -51,7 +48,7 @@ void gr_linear_rep_movsdm(ubyte *src, ubyte *dest, int num_pixels) {
 		else	dest++;
 }
 
-void gr_linear_rep_movsdm_faded(ubyte * src, ubyte * dest, int num_pixels, ubyte fade_value ) {
+static void gr_linear_rep_movsdm_faded(ubyte * src, ubyte * dest, int num_pixels, ubyte fade_value ) {
 	register ubyte c;
 	while (num_pixels--)
 		if ((c=*src++)!=255)
@@ -59,7 +56,7 @@ void gr_linear_rep_movsdm_faded(ubyte * src, ubyte * dest, int num_pixels, ubyte
 		else	dest++;
 }
 
-void gr_linear_rep_movsd_2x(ubyte * source, ubyte * dest, uint nbytes ) {
+static void gr_linear_rep_movsd_2x(ubyte * source, ubyte * dest, uint nbytes ) {
 	register ubyte c;
 	while (nbytes--) {
 		if (nbytes&1)
@@ -73,7 +70,7 @@ void gr_linear_rep_movsd_2x(ubyte * source, ubyte * dest, uint nbytes ) {
 	}
 }
 
-void gr_ubitmap00( int x, int y, grs_bitmap *bm )
+static void gr_ubitmap00( int x, int y, grs_bitmap *bm )
 {
 	register int y1;
 	int dest_rowsize;
@@ -96,7 +93,7 @@ void gr_ubitmap00( int x, int y, grs_bitmap *bm )
 	}
 }
 
-void gr_ubitmap00m( int x, int y, grs_bitmap *bm )
+static void gr_ubitmap00m( int x, int y, grs_bitmap *bm )
 {
 	register int y1;
 	int dest_rowsize;
@@ -124,7 +121,7 @@ void gr_ubitmap00m( int x, int y, grs_bitmap *bm )
 	}
 }
 
-void gr_ubitmap012( int x, int y, grs_bitmap *bm )
+static void gr_ubitmap012( int x, int y, grs_bitmap *bm )
 {
 	register int x1, y1;
 	unsigned char * src;
@@ -139,7 +136,7 @@ void gr_ubitmap012( int x, int y, grs_bitmap *bm )
 	}
 }
 
-void gr_ubitmap012m( int x, int y, grs_bitmap *bm )
+static void gr_ubitmap012m( int x, int y, grs_bitmap *bm )
 {
 	register int x1, y1;
 	unsigned char * src;
@@ -157,7 +154,7 @@ void gr_ubitmap012m( int x, int y, grs_bitmap *bm )
 	}
 }
 
-void gr_ubitmapGENERIC(int x, int y, grs_bitmap * bm)
+static void gr_ubitmapGENERIC(int x, int y, grs_bitmap * bm)
 {
 	register int x1, y1;
 
@@ -169,7 +166,7 @@ void gr_ubitmapGENERIC(int x, int y, grs_bitmap * bm)
 	}
 }
 
-void gr_ubitmapGENERICm(int x, int y, grs_bitmap * bm)
+static void gr_ubitmapGENERICm(int x, int y, grs_bitmap * bm)
 {
 	register int x1, y1;
 	ubyte c;
@@ -245,7 +242,7 @@ void gr_ubitmapm( int x, int y, grs_bitmap *bm )
 }
 
 // From Linear to Linear
-void gr_bm_ubitblt00(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * src, grs_bitmap * dest)
+static void gr_bm_ubitblt00(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * src, grs_bitmap * dest)
 {
 	unsigned char * dbits;
 	unsigned char * sbits;
@@ -276,7 +273,7 @@ void gr_bm_ubitblt00(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap *
 }
 
 // From Linear to Linear Masked
-void gr_bm_ubitblt00m(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * src, grs_bitmap * dest)
+static void gr_bm_ubitblt00m(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * src, grs_bitmap * dest)
 {
 	unsigned char * dbits;
 	unsigned char * sbits;
@@ -473,7 +470,7 @@ void gr_bm_ubitbltm(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * s
 
 }
 
-void gr_bm_ubitblt00_rle(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * src, grs_bitmap * dest)
+static void gr_bm_ubitblt00_rle(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * src, grs_bitmap * dest)
 {
 	unsigned char * dbits;
 	unsigned char * sbits;
@@ -501,7 +498,7 @@ void gr_bm_ubitblt00_rle(int w, int h, int dx, int dy, int sx, int sy, grs_bitma
 	}
 }
 
-void gr_bm_ubitblt00m_rle(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * src, grs_bitmap * dest)
+static void gr_bm_ubitblt00m_rle(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * src, grs_bitmap * dest)
 {
 	unsigned char * dbits;
 	unsigned char * sbits;
@@ -531,7 +528,7 @@ void gr_bm_ubitblt00m_rle(int w, int h, int dx, int dy, int sx, int sy, grs_bitm
 // in rle.c
 
 
-void gr_bm_ubitblt0x_rle(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * src,
+static void gr_bm_ubitblt0x_rle(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * src,
 						 grs_bitmap * dest, int masked )
 {
 	int i, data_offset;
diff --git a/include/grdef.h b/include/grdef.h
index 8b882a743..ca4724651 100644
--- a/include/grdef.h
+++ b/include/grdef.h
@@ -35,9 +35,6 @@ extern unsigned int gr_var_color;
 extern unsigned int gr_var_bwidth;
 extern unsigned char * gr_var_bitmap;
 
-void gr_linear_movsd( ubyte * source, ubyte * dest, unsigned int nbytes);
-void gr_linear_rep_movsd_2x(ubyte *source, ubyte *dest, unsigned int nbytes);
-
 void gr_linear_line( int x0, int y0, int x1, int y1);
 
 extern unsigned int Table8to32[256];