From 3e96806f7e2baf49346d8670a21575f12fe79138 Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Tue, 29 Mar 2016 07:55:58 +0000
Subject: [PATCH]  Renamed DisposeAndNil to FreeMemAndNil

git-svn-id: trunk@33378 -
---
 rtl/objpas/sysutils/sysutilh.inc | 2 +-
 rtl/objpas/sysutils/sysutils.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rtl/objpas/sysutils/sysutilh.inc b/rtl/objpas/sysutils/sysutilh.inc
index 862c02a1e5..4066343db8 100644
--- a/rtl/objpas/sysutils/sysutilh.inc
+++ b/rtl/objpas/sysutils/sysutilh.inc
@@ -321,7 +321,7 @@ Type
   {$ENDIF}
   
   procedure FreeAndNil(var obj);
-  procedure DisposeAndNil(var p);
+  procedure FreeMemAndNil(var p);
 
   { interface handling }
   {$i intfh.inc}
diff --git a/rtl/objpas/sysutils/sysutils.inc b/rtl/objpas/sysutils/sysutils.inc
index b8faeeda0f..2b24a4d69d 100644
--- a/rtl/objpas/sysutils/sysutils.inc
+++ b/rtl/objpas/sysutils/sysutils.inc
@@ -162,7 +162,7 @@ end;
         temp.free;
       end;
 
-    procedure DisposeAndNil(var p);
+    procedure FreeMemAndNil(var p);
     
     var
       temp:Pointer;