From 952f8f0d1dbd6d71a3b96f93888d24445c63308c Mon Sep 17 00:00:00 2001
From: Sjoerd van der Berg <harekiet@users.sourceforge.net>
Date: Mon, 30 Jan 2006 10:55:49 +0000
Subject: [PATCH] Fix some gcc compilation issues

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2457
---
 configure.in              | 2 ++
 src/Makefile.am           | 5 +++--
 src/hardware/vga_draw.cpp | 3 ++-
 src/libs/Makefile.am      | 3 +++
 src/libs/zmbv/Makefile.am | 4 ++++
 src/libs/zmbv/zmbv.cpp    | 5 +++--
 src/libs/zmbv/zmbv.h      | 8 +++++++-
 7 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 src/libs/Makefile.am
 create mode 100644 src/libs/zmbv/Makefile.am

diff --git a/configure.in b/configure.in
index d4d95ced..3afe2214 100644
--- a/configure.in
+++ b/configure.in
@@ -296,6 +296,8 @@ src/gui/Makefile
 src/hardware/Makefile
 src/hardware/serialport/Makefile
 src/ints/Makefile
+src/libs/Makefile
+src/libs/zmbv/Makefile
 src/misc/Makefile
 src/shell/Makefile
 src/platform/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index c58e2e4f..c18bf996 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,11 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
 
-SUBDIRS = cpu debug dos fpu gui hardware ints misc shell platform 
+SUBDIRS = cpu debug dos fpu gui hardware libs ints misc shell platform 
 
 bin_PROGRAMS = dosbox
 
 dosbox_SOURCES = dosbox.cpp
 dosbox_LDADD = cpu/libcpu.a debug/libdebug.a dos/libdos.a fpu/libfpu.a  hardware/libhardware.a gui/libgui.a \
-               ints/libints.a misc/libmisc.a shell/libshell.a hardware/serialport/libserial.a
+               ints/libints.a misc/libmisc.a shell/libshell.a hardware/serialport/libserial.a \
+	       libs/zmbv/libzmbv.a
 
diff --git a/src/hardware/vga_draw.cpp b/src/hardware/vga_draw.cpp
index 1d9b6e29..96b6c742 100644
--- a/src/hardware/vga_draw.cpp
+++ b/src/hardware/vga_draw.cpp
@@ -237,6 +237,7 @@ static Bit8u * VGA_Draw_VGA_Line_HWMouse(Bitu vidstart, Bitu panning, Bitu line)
 
 static Bit32u FontMask[2]={0xffffffff,0x0};
 static Bit8u * VGA_TEXT_Draw_Line(Bitu vidstart,Bitu panning,Bitu line) {
+	Bitu font_addr;
 	Bit32u * draw=(Bit32u *)TempLine;
 	Bit8u * vidmem=&vga.gfxmem_start[vidstart];
 	for (Bitu cx=0;cx<vga.draw.blocks;cx++) {
@@ -251,7 +252,7 @@ static Bit8u * VGA_TEXT_Draw_Line(Bitu vidstart,Bitu panning,Bitu line) {
 		*draw++=fg&mask2 | bg&~mask2;
 	}
 	if (!vga.draw.cursor.enabled || !(vga.draw.cursor.count&0x8)) goto skip_cursor;
-	Bitu font_addr=(vga.draw.cursor.address-vidstart) >> 1;
+	font_addr = (vga.draw.cursor.address-vidstart) >> 1;
 	if (font_addr>=0 && font_addr<vga.draw.blocks) {
 		if (line<vga.draw.cursor.sline) goto skip_cursor;
 		if (line>vga.draw.cursor.eline) goto skip_cursor;
diff --git a/src/libs/Makefile.am b/src/libs/Makefile.am
new file mode 100644
index 00000000..b74bb58a
--- /dev/null
+++ b/src/libs/Makefile.am
@@ -0,0 +1,3 @@
+AM_CPPFLAGS = -I$(top_srcdir)/include
+
+SUBDIRS = zmbv 
\ No newline at end of file
diff --git a/src/libs/zmbv/Makefile.am b/src/libs/zmbv/Makefile.am
new file mode 100644
index 00000000..6f6f5e31
--- /dev/null
+++ b/src/libs/zmbv/Makefile.am
@@ -0,0 +1,4 @@
+AM_CPPFLAGS = -I$(top_srcdir)/include
+
+noinst_LIBRARIES = libzmbv.a
+libzmbv_a_SOURCES = zmbv.cpp zmbv.h
diff --git a/src/libs/zmbv/zmbv.cpp b/src/libs/zmbv/zmbv.cpp
index b697934c..01436953 100644
--- a/src/libs/zmbv/zmbv.cpp
+++ b/src/libs/zmbv/zmbv.cpp
@@ -18,6 +18,7 @@
 
 #include <zlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <math.h>
 
@@ -396,10 +397,10 @@ void VideoCodec::UnXorFrame(void) {
 	workPos=(workPos + blockcount*2 + 3) & ~3;
 	for (int b=0;b<blockcount;b++) {
 		FrameBlock * block=&blocks[b];
-		int xor = vectors[b*2+0] & 1;
+		int delta = vectors[b*2+0] & 1;
 		int vx = vectors[b*2+0] >> 1;
 		int vy = vectors[b*2+1] >> 1;
-		if (xor) UnXorBlock<P>(vx,vy,block);
+		if (delta) UnXorBlock<P>(vx,vy,block);
 		else CopyBlock<P>(vx,vy,block);
 	}
 }
diff --git a/src/libs/zmbv/zmbv.h b/src/libs/zmbv/zmbv.h
index f0b8b4f4..b1c97aa2 100644
--- a/src/libs/zmbv/zmbv.h
+++ b/src/libs/zmbv/zmbv.h
@@ -16,8 +16,14 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-
+#ifndef DOSBOX_DOSBOX_H
+#ifdef _MSC_VER
 #define INLINE __forceinline
+#else
+#define INLINE inline
+#endif
+#endif
+
 #define CODEC_4CC "ZMBV"
 
 typedef enum {