From 5efb1744bb621c59f5bc57462a3d16ff7be4daf7 Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Tue, 13 Apr 1999 08:52:27 +0000
Subject: [PATCH] + Moved strings.inc to stringl.inc, to avoid conflict with
 strings unit

---
 fcl/inc/Makefile.inc                 | 2 +-
 fcl/inc/classes.inc                  | 7 +++++--
 fcl/inc/{strings.inc => stringl.inc} | 5 ++++-
 3 files changed, 10 insertions(+), 4 deletions(-)
 rename fcl/inc/{strings.inc => stringl.inc} (98%)

diff --git a/fcl/inc/Makefile.inc b/fcl/inc/Makefile.inc
index 44b972a7bf..a650e4fb79 100644
--- a/fcl/inc/Makefile.inc
+++ b/fcl/inc/Makefile.inc
@@ -2,7 +2,7 @@
 # This makefile sets some needed variable, common to all targets
 
 INCNAMES=classes.inc classesh.inc bits.inc collect.inc compon.inc filer.inc\
-         lists.inc parser.inc persist.inc reader.inc streams.inc strings.inc\
+         lists.inc parser.inc persist.inc reader.inc streams.inc stringl.inc\
          thread.inc writer.inc
 
 INCUNITS=classes inifiles
\ No newline at end of file
diff --git a/fcl/inc/classes.inc b/fcl/inc/classes.inc
index a1f007a8ef..6b4ea537ca 100644
--- a/fcl/inc/classes.inc
+++ b/fcl/inc/classes.inc
@@ -63,7 +63,7 @@
 {$i lists.inc}
 
 { TStrings and TStringList implementations }
-{$i strings.inc}
+{$i stringl.inc}
 
 { TThread implementation }
 {$i thread.inc}
@@ -377,7 +377,10 @@ end;
 
 {
   $Log$
-  Revision 1.9  1999-04-08 10:18:50  peter
+  Revision 1.10  1999-04-13 08:52:29  michael
+  + Moved strings.inc to stringl.inc, to avoid conflict with strings unit
+
+  Revision 1.9  1999/04/08 10:18:50  peter
     * makefile updates
 
 }
diff --git a/fcl/inc/strings.inc b/fcl/inc/stringl.inc
similarity index 98%
rename from fcl/inc/strings.inc
rename to fcl/inc/stringl.inc
index 4580d35340..196e6c4011 100644
--- a/fcl/inc/strings.inc
+++ b/fcl/inc/stringl.inc
@@ -938,7 +938,10 @@ end;
 
 {
   $Log$
-  Revision 1.15  1999-04-08 10:18:56  peter
+  Revision 1.1  1999-04-13 08:52:28  michael
+  + Moved strings.inc to stringl.inc, to avoid conflict with strings unit
+
+  Revision 1.15  1999/04/08 10:18:56  peter
     * makefile updates
 
 }