From 8b9ba65e3685468675af1556e6a71fb3ea3dbe0a Mon Sep 17 00:00:00 2001 From: Peter Veenstra Date: Tue, 14 Feb 2006 12:44:38 +0000 Subject: [PATCH] Fix a warning Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2502 --- src/gui/render_scalers.cpp | 2 +- src/hardware/vga_s3.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/render_scalers.cpp b/src/gui/render_scalers.cpp index 28f44864..dc7d084e 100644 --- a/src/gui/render_scalers.cpp +++ b/src/gui/render_scalers.cpp @@ -29,7 +29,7 @@ Bit8u Scaler_Aspect[SCALER_MAXHEIGHT]; Bit16u Scaler_ChangedLines[SCALER_MAXHEIGHT]; Bitu Scaler_ChangedLineIndex; -union { +static union { Bit32u b32 [4][SCALER_MAXWIDTH*3]; Bit16u b16 [4][SCALER_MAXWIDTH*3]; Bit8u b8 [4][SCALER_MAXWIDTH*3]; diff --git a/src/hardware/vga_s3.cpp b/src/hardware/vga_s3.cpp index 67c9f1f3..8668cac8 100644 --- a/src/hardware/vga_s3.cpp +++ b/src/hardware/vga_s3.cpp @@ -16,6 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $Id: vga_s3.cpp,v 1.3 2006-02-14 12:44:38 qbix79 Exp $ */ + #include "dosbox.h" #include "inout.h" #include "vga.h" @@ -429,4 +431,5 @@ Bitu SVGA_S3_GetClock(void) { else clock=1000*S3_CLOCK(vga.s3.clk[clock].m,vga.s3.clk[clock].n,vga.s3.clk[clock].r); return clock; -} \ No newline at end of file +} +