# HG changeset patch
# User jwe
# Date 848466958 0
# Node ID 9b7cd3ff889188625e829de48df0ae946a7abb15
# Parent  8ddee13d19f98c194b0667494a4b603f61d7b418
[project @ 1996-11-20 05:15:56 by jwe]

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Nov 19 23:10:01 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Makeconf.in (INCFLAGS): Add libcruft/misc directory.
+
 Thu Nov 14 00:07:31 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* emacs/octave.el (octave-text-functions): Change set and show to
diff --git a/Makeconf.in b/Makeconf.in
--- a/Makeconf.in
+++ b/Makeconf.in
@@ -62,17 +62,18 @@
 # Clean up INCFLAGS a bit if we are not compiling in a separate
 # directory.
 ifeq ($(srcdir),.)
-  TMP_IF_1 = -I. -I../src
+  TMP_IF_1 = -I.
 else
-  TMP_IF_1 = -I. -I$(srcdir) -I../src
+  TMP_IF_1 = -I. -I$(srcdir)
 endif
 ifeq ($(TOPDIR),$(top_srcdir))
   TMP_IF_2 = -I$(TOPDIR) -I$(TOPDIR)/liboctave -I$(TOPDIR)/src \
-	-I$(TOPDIR)/glob
+	-I$(TOPDIR)/glob -I$(TOPDIR)/libcruft/misc
 else
   TMP_IF_2 = -I$(TOPDIR) -I$(TOPDIR)/liboctave -I$(TOPDIR)/src \
-	-I$(TOPDIR)/glob -I$(top_srcdir) -I$(top_srcdir)/liboctave \
-	-I$(top_srcdir)/src -I$(top_srcdir)/glob
+	-I$(TOPDIR)/glob -I$(TOPDIR)/libcruft/misc -I$(top_srcdir) \
+	-I$(top_srcdir)/liboctave -I$(top_srcdir)/src \
+	-I$(top_srcdir)/glob -I$(top_srcdir)/libcruft/misc
 endif
 INCFLAGS = $(TMP_IF_1) $(TMP_IF_2) $(DLFCN_INCFLAGS)
 
diff --git a/liboctave/ChangeLog b/liboctave/ChangeLog
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,10 @@
+Tue Nov 19 23:07:45 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* f77-fcn.c, f77-fcn.h: Move to libcruft/misc directory.
+
+	* Makefile.in (INCLUDES): Delete f77-fcn.h.
+	(SOURCES): Delete f77-fcn.c.
+
 Fri Nov 15 13:47:34 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* lo-ieee.h: [SCO]: Declare isinf and isnan.
diff --git a/liboctave/Makefile.in b/liboctave/Makefile.in
--- a/liboctave/Makefile.in
+++ b/liboctave/Makefile.in
@@ -38,7 +38,7 @@
 	LinConst.h LP.h LPsolve.h LSODE.h NLConst.h NLEqn.h NLFunc.h \
 	NLP.h NPSOL.h ODE.h ODEFunc.h Objective.h QP.h QPSOL.h Quad.h \
 	Range.h base-de.h base-min.h byte-swap.h cmd-hist.h data-conv.h \
-	dir-ops.h file-ops.h f77-fcn.h getopt.h idx-vector.h lo-error.h \
+	dir-ops.h file-ops.h getopt.h idx-vector.h lo-error.h \
 	lo-ieee.h lo-mappers.h lo-utils.h mach-info.h oct-alloc.h \
 	oct-cmplx.h oct-glob.h oct-math.h oct-term.h pathsearch.h \
 	prog-args.h statdefs.h str-vec.h sun-utils.h sysdir.h \
@@ -62,7 +62,7 @@
 SOURCES := Bounds.cc CollocWt.cc DAE.cc DASSL.cc FEGrid.cc FSQP.cc \
 	LinConst.cc LPsolve.cc LSODE.cc NLEqn.cc NPSOL.cc QPSOL.cc \
 	Quad.cc Range.cc acosh.c asinh.c atanh.c cmd-hist.cc \
-	data-conv.cc dir-ops.cc erf.c erfc.c f77-fcn.c file-ops.cc \
+	data-conv.cc dir-ops.cc erf.c erfc.c file-ops.cc \
 	filemode.c gamma.c getopt.c getopt1.c idx-vector.cc lgamma.c \
 	lo-ieee.cc lo-mappers.cc lo-utils.cc mach-info.cc mkdir.c \
 	oct-alloc.cc oct-glob.cc oct-term.cc pathsearch.cc \
diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 Tue Nov 19 12:01:13 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* sysdep.cc (OS2_init): New function.
+	[__EMX__] (sysdep_init): Call it.
+
 	* lex.l (plot_style_token): Add new plot styles for gnuplot 3.6.
 	* pt-plot.cc (subplot_style::columns_ok): Rename from
 	subplot_style::errorbars. Recognize more styles and do a better
diff --git a/src/sysdep.cc b/src/sysdep.cc
--- a/src/sysdep.cc
+++ b/src/sysdep.cc
@@ -134,6 +134,14 @@
 }
 #endif
 
+#if defined (__EMX__)
+OS2_init (void)
+{
+  _control87 ((EM_INVALID | EM_DENORMAL | EM_ZERODIVIDE | EM_OVERFLOW
+	       | EM_UNDERFLOW | EM_INEXACT), MCW_EM);
+}
+#endif
+
 #if defined (SCO)
 static void
 SCO_init (void)
@@ -178,6 +186,8 @@
   BSD_init ();
 #elif defined NeXT
   NeXT_init ();
+#elif defined __EMX__
+  OS2_init ();
 #elif defined (SCO)
   SCO_init ();
 #endif