From 45950c18df10a0bb44171784aa99a24c0513a21a Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Mon, 1 Feb 1999 20:27:16 +0000
Subject: [PATCH] OS/2 XFree86 changes from Alexander Mai.

git-svn-id: file:///fltk/svn/fltk/trunk@264 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 makefiles/Makefile.os2x | 14 ++++++++++----
 src/Fl_Clock.cxx        |  8 ++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/makefiles/Makefile.os2x b/makefiles/Makefile.os2x
index cca9b1d1d..4b72b7423 100644
--- a/makefiles/Makefile.os2x
+++ b/makefiles/Makefile.os2x
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile.os2x,v 1.5 1999/01/13 16:25:17 mike Exp $"
+# "$Id: Makefile.os2x,v 1.6 1999/02/01 20:27:15 mike Exp $"
 #
 # Top-level makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -23,9 +23,9 @@
 # Please report all bugs and problems to "fltk-bugs@easysw.com".
 #
 
-# SHELL=/bin/sh
+SHELL=cmd.exe
 
-all:
+all: makeinclude config.h
 	echo "=== making src ==="
 	touch src/makedepend
 	cd src & $(MAKE)
@@ -67,6 +67,12 @@ clean:
 	touch test/makedepend
 	cd test & $(MAKE) clean
 
+config.h: makefiles\config.os2x
+	copy $< $@
+
+makeinclude: makefiles\makeinclude.os2x
+	copy $< $@
+
 #
-# End of "$Id: Makefile.os2x,v 1.5 1999/01/13 16:25:17 mike Exp $".
+# End of "$Id: Makefile.os2x,v 1.6 1999/02/01 20:27:15 mike Exp $".
 #
diff --git a/src/Fl_Clock.cxx b/src/Fl_Clock.cxx
index a269820d8..2ce2c5179 100644
--- a/src/Fl_Clock.cxx
+++ b/src/Fl_Clock.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Clock.cxx,v 1.7 1999/01/13 19:43:13 mike Exp $"
+// "$Id: Fl_Clock.cxx,v 1.8 1999/02/01 20:27:16 mike Exp $"
 //
 // Clock widget for the Fast Light Tool Kit (FLTK).
 //
@@ -28,9 +28,9 @@
 #include <FL/fl_draw.H>
 #include <math.h>
 #include <time.h>
-#if !defined(WIN32) && !defined(__EMX__)
+#ifndef WIN32
 #  include <sys/time.h>
-#endif /* !WIN32 && !__EMX__ */
+#endif /* !WIN32 */
 
 // Original clock display written by Paul Haeberli at SGI.
 // Modifications by Mark Overmars for Forms
@@ -170,5 +170,5 @@ Fl_Clock::~Fl_Clock() {
 }
 
 //
-// End of "$Id: Fl_Clock.cxx,v 1.7 1999/01/13 19:43:13 mike Exp $".
+// End of "$Id: Fl_Clock.cxx,v 1.8 1999/02/01 20:27:16 mike Exp $".
 //