From 2d3551267dfb919a4c251c7d29959a325c356ab1 Mon Sep 17 00:00:00 2001
From: pierre <pierre@freepascal.org>
Date: Thu, 20 Aug 1998 08:08:36 +0000
Subject: [PATCH]   * dpmiexcp did not compile with older versions     due to
 the proc to procvar bug   * makefile separator problem fixed

---
 rtl/dos/go32v2/dpmiexcp.pp | 17 +++++++++++++++--
 rtl/dos/go32v2/makefile    | 13 +++++++++----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/rtl/dos/go32v2/dpmiexcp.pp b/rtl/dos/go32v2/dpmiexcp.pp
index 2436607ad9..62a78226e1 100644
--- a/rtl/dos/go32v2/dpmiexcp.pp
+++ b/rtl/dos/go32v2/dpmiexcp.pp
@@ -298,12 +298,20 @@ begin
   signal:=temp;
 end;
 
+{$ifndef VER0_99_5}
+{$ifndef VER0_99_6}
+
 { C counter part }
 function c_signal(sig : longint;func : SignalHandler) : SignalHandler;
             cdecl;[public,alias : '_signal'];
+var
+  temp : SignalHandler;
   begin
-     c_signal:=signal(sig,func);
+     temp:=signal(sig,func);
+     c_signal:=temp;
   end;
+{$endif VER0_99_5}
+{$endif VER0_99_6}
 
 const signames : array [0..14] of string[4] = (
    'ABRT','FPE ','ILL ','SEGV','TERM','ALRM','HUP ',
@@ -930,7 +938,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.8  1998-08-19 10:56:33  pierre
+  Revision 1.9  1998-08-20 08:08:36  pierre
+    * dpmiexcp did not compile with older versions
+      due to the proc to procvar bug
+    * makefile separator problem fixed
+
+  Revision 1.8  1998/08/19 10:56:33  pierre
     + added some special code for C interface
       to avoid loading of crt1.o or dpmiexcp.o from the libc.a
 
diff --git a/rtl/dos/go32v2/makefile b/rtl/dos/go32v2/makefile
index 36d5e6882c..1a0891fd1c 100644
--- a/rtl/dos/go32v2/makefile
+++ b/rtl/dos/go32v2/makefile
@@ -277,15 +277,15 @@ sharedlib:
 staticlibinstall: staticlib
 	$(MKDIR) $(STATIC_LIBINSTALLDIR)
 	$(MKDIR) $(STATIC_UNITINSTALLDIR)
-        $(INSTALLEXE) fpc$(STATICLIBEXT) $(STATIC_LIBINSTALLDIR)
-        $(INSTALL) *$(PPUEXT) *$(OEXT) $(STATIC_UNITINSTALLDIR)
+	$(INSTALLEXE) fpc$(STATICLIBEXT) $(STATIC_LIBINSTALLDIR)
+	$(INSTALL) *$(PPUEXT) *$(OEXT) $(STATIC_UNITINSTALLDIR)
 
 sharedlibinstall: sharedlib
 
 libinstall: staticlibinstall
 
 libsclean : clean
-        -$(DEL) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+	-$(DEL) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
 
 #####################################################################
 # Default targets
@@ -295,7 +295,12 @@ include $(CFG)/makefile.def
 
 #
 # $Log$
-# Revision 1.13  1998-08-19 10:05:01  peter
+# Revision 1.14  1998-08-20 08:08:37  pierre
+#   * dpmiexcp did not compile with older versions
+#     due to the proc to procvar bug
+#   * makefile separator problem fixed
+#
+# Revision 1.13  1998/08/19 10:05:01  peter
 #   * fixed for go32v2 staticlib
 #
 # Revision 1.12  1998/08/05 10:31:05  pierre