From b7dcec48ea9e89a58135014135b78a18f3c1bdb8 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Thu, 20 Sep 2007 13:34:28 +0000
Subject: [PATCH] INTEGRATION: CWS os2port01 (1.2.18); FILE MERGED 2006/12/28
 14:54:33 ydario 1.2.18.1: OS/2 initial import.

---
 dmake/os2/ruletab.c | 7 +++++--
 dmake/state.c       | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/dmake/os2/ruletab.c b/dmake/os2/ruletab.c
index 97204272db36..42946dd14c6d 100644
--- a/dmake/os2/ruletab.c
+++ b/dmake/os2/ruletab.c
@@ -1,4 +1,4 @@
-/* RCS  $Id: ruletab.c,v 1.2 2006-04-20 12:08:38 hr Exp $
+/* RCS  $Id: ruletab.c,v 1.3 2007-09-20 14:34:28 vg Exp $
 --
 -- SYNOPSIS
 --      Default initial configuration of dmake.
@@ -33,9 +33,12 @@
  * We dont need the two different cases of Makefile, so only keep the
  * pretty one.
  */
+//  ".IMPORT .IGNORE: DMAKEROOT SOLARVER UPD INPATH OS UPDMINOREXT",
+
 static char *_rules[] = {
-    "MAXLINELENGTH := 2046",
+    "MAXLINELENGTH := 8190",
     "MAXPROCESSLIMIT := 16",
+#include "dmakeroot.h"
     ".IMPORT .IGNORE: DMAKEROOT"
     ".MAKEFILES : makefile.mk Makefile",
     ".SOURCE    : .NULL",
diff --git a/dmake/state.c b/dmake/state.c
index 509377539aee..5179ead4fd14 100644
--- a/dmake/state.c
+++ b/dmake/state.c
@@ -1,4 +1,4 @@
-/* RCS  $Id: state.c,v 1.2 2006-04-20 12:02:17 hr Exp $
+/* RCS  $Id: state.c,v 1.3 2007-09-20 14:33:53 vg Exp $
 --
 -- SYNOPSIS
 --      .KEEP_STATE state file management
@@ -226,5 +226,6 @@ FILE *fp;
    if( fgets(buf, size, fp) == NULL ) return(0);
 
    if( (p=strrchr(buf,'\n')) != NIL(char) ) *p='\0';
+   if( (p=strrchr(buf,'\r')) != NIL(char) ) *p='\0';
    return(1);
 }