From 98cda26d9d3039d5527fba038b659a154a5e7d0e Mon Sep 17 00:00:00 2001
From: Aaron Robinson <caustik@caustik.com>
Date: Wed, 12 Feb 2003 21:11:57 +0000
Subject: [PATCH] .

---
 Include/Win32/CxbxKrnl/OOVPA.h | 17 ++++++++---------
 Makefile                       |  1 +
 Source/Core/OpenXDK.cpp        |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Include/Win32/CxbxKrnl/OOVPA.h b/Include/Win32/CxbxKrnl/OOVPA.h
index 72428317b..ba1360b79 100644
--- a/Include/Win32/CxbxKrnl/OOVPA.h
+++ b/Include/Win32/CxbxKrnl/OOVPA.h
@@ -57,12 +57,6 @@ struct OVPS
 // ******************************************************************
 struct OVP
 {
-    union OVPU
-    {
-        OVPL *ovpl;
-
-        OVPS *ovps;
-    };
 };
 
 // ******************************************************************
@@ -71,9 +65,14 @@ struct OVP
 struct OOVPA
 {
     uint16  Count : 15; // Number of Order,Value Pairs
-    uint16  Large : 1;  // "Large" or "Small" offsets? (16,8 bit)
-
-    OVP     ovp;
+    uint16  Large : 1;  // Large (16 bit) or Small (8 bit) offsets?
+
+    union OVPU
+    {
+        OVPL ovpl[];
+        OVPS ovps[];
+    }
+	ovpu;
 };
 
 #endif
diff --git a/Makefile b/Makefile
index d91663590..084d8d33b 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,7 @@ GCC295 = cpp0-2.95
 OBJECTS	= Source/Core/Error.o \
 	Source/Core/Exe.o \
 	Source/Core/Xbe.o \
+        Source/Core/OpenXDK.o \
 	Source/Standard/Cxbe/Main.o
 
 RESOURCES = 
diff --git a/Source/Core/OpenXDK.cpp b/Source/Core/OpenXDK.cpp
index 81b703cd9..93ecf6920 100644
--- a/Source/Core/OpenXDK.cpp
+++ b/Source/Core/OpenXDK.cpp
@@ -33,7 +33,7 @@
 // ******************************************************************
 #include "Cxbx.h"
 
-extern uint08 OpenXDK[] =
+uint08 OpenXDK[] =
 {
     0x5A, 0x06, 0x23, 0x49, 0x13, 0x0F, 0x33, 0x49, 0x13, 0x0F, 
     0x13, 0x4F, 0x33, 0x0D, 0x13, 0x49, 0x23, 0x46, 0x00, 0x23, 
@@ -75,4 +75,4 @@ extern uint08 OpenXDK[] =
     0x33, 0xFA, 0x00, 0x13, 0x0F, 0x13, 0xBE, 0x06, 0x03, 
 };
 
-extern uint32 dwSizeOfOpenXDK = 0x0000017B;
+uint32 dwSizeOfOpenXDK = 0x0000017B;