From 0a9975242a32510c59e33e11868d907b94cf9ac2 Mon Sep 17 00:00:00 2001
From: Robert Pouliot <krynos@clic.net>
Date: Fri, 16 Apr 1999 06:55:26 +0000
Subject: [PATCH] A few patches to help Wine to compile on OS/2.

---
 graphics/path.c           |  4 ++++
 graphics/psdrv/graphics.c | 10 +++++++---
 include/sig_context.h     |  2 --
 tools/make_os2.cmd        | 13 +++++++++++++
 tools/make_os2.sh         | 11 -----------
 5 files changed, 24 insertions(+), 16 deletions(-)
 create mode 100644 tools/make_os2.cmd
 delete mode 100644 tools/make_os2.sh

diff --git a/graphics/path.c b/graphics/path.c
index 6e174fc35de..49b049c30ea 100644
--- a/graphics/path.c
+++ b/graphics/path.c
@@ -8,6 +8,10 @@
 #include <malloc.h>
 #include <math.h>
 #include <string.h>
+#include "config.h"
+#if defined(HAVE_FLOAT_H)
+#include <float.h>
+#endif
 
 #include "winbase.h"
 #include "wingdi.h"
diff --git a/graphics/psdrv/graphics.c b/graphics/psdrv/graphics.c
index 97d3bc7ad28..a7f970e6366 100644
--- a/graphics/psdrv/graphics.c
+++ b/graphics/psdrv/graphics.c
@@ -6,12 +6,16 @@
  */
 #include <string.h>
 #include <math.h>
+#include "config.h"
+#if defined(HAVE_FLOAT_H)
+ #include <float.h>
+#endif
+#if !defined(PI)
+ #define PI M_PI
+#endif
 #include "psdrv.h"
 #include "debug.h"
 #include "winspool.h"
-#ifndef PI
-#define PI M_PI
-#endif
 
 /**********************************************************************
  *	     PSDRV_MoveToEx
diff --git a/include/sig_context.h b/include/sig_context.h
index cd461870529..1c43d948c50 100644
--- a/include/sig_context.h
+++ b/include/sig_context.h
@@ -98,8 +98,6 @@ typedef struct ucontext SIGCONTEXT;
 #endif  /* svr4 || SCO_DS */
 
 #ifdef __EMX__
-typedef unsigned long ULONG;
-typedef unsigned short USHORT;
 typedef struct _fpreg		/* Note 1 */
 {
   ULONG	 losig;
diff --git a/tools/make_os2.cmd b/tools/make_os2.cmd
new file mode 100644
index 00000000000..ec0cc541eec
--- /dev/null
+++ b/tools/make_os2.cmd
@@ -0,0 +1,13 @@
+@echo off
+rem #!/bin/sh
+rem GCCLOAD not needed, but recommended...
+rem set GCCLOAD=5
+set MAKE=make
+set CC=gcc
+set CFLAGS=-O2 -Zmtd -D__ST_MT_ERRNO__
+set YACC=bison -y
+set LEX=flex -olex.yy.c
+set RANLIB=ar -s
+set PROGEXT=.exe
+rem export CC CFLAGS YACC LEX RANLIB PROGEXT
+sh configure --x-includes=%X11ROOT%/XFree86/include -x-libraries=%X11ROOT%/XFree86/lib
diff --git a/tools/make_os2.sh b/tools/make_os2.sh
deleted file mode 100644
index 10519705d93..00000000000
--- a/tools/make_os2.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# GCCLOAD not needed, but recommended...
-#GCCLOAD=5
-CC=gcc
-CFLAGS="-O2 -Zmtd -D__ST_MT_ERRNO__"
-YACC="bison -y"
-LEX="flex -olex.yy.c"
-RANLIB="ar -s"
-PROGEXT=".exe"
-export CC CFLAGS YACC LEX RANLIB PROGEXT
-./configure --x-includes=$X11ROOT/XFree86/include -x-libraries=$X11ROOT/XFree86/lib