[Ada] Memtrack: have only one definition of fwrite

2018-06-11  Arnaud Charlet  <charlet@adacore.com>

gcc/ada/

	* libgnat/memtrack.adb (fwrite): Remove second definition.

From-SVN: r261407

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 1946e5480174668cfe249eb470d9da45cc9f10c2..791942d377cf97b1c1c7c242c12060a2d050b62a 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2018-06-11  Arnaud Charlet  <charlet@adacore.com>
+
+       * libgnat/memtrack.adb (fwrite): Remove second definition.
+
 2018-06-11  Javier Miranda  <miranda@adacore.com>
 
        * sinfo.ads (Is_Dynamic_Coextension): Adding documentation.

diff --git a/gcc/ada/libgnat/memtrack.adb b/gcc/ada/libgnat/memtrack.adb
index efe0fb19405d87f1658b4953d08527b70bb39ba2..eba05b4402c68bbf3249919c17f007f38144f8b7 100644 (file)
--- a/gcc/ada/libgnat/memtrack.adb
+++ b/gcc/ada/libgnat/memtrack.adb
@@ -107,12 +107,6 @@ package body System.Memory is
       Size   : size_t;
       Nmemb  : size_t;
       Stream : File_Ptr);
-
-   procedure fwrite
-     (Str    : String;
-      Size   : size_t;
-      Nmemb  : size_t;
-      Stream : File_Ptr);
    pragma Import (C, fwrite);
 
    procedure fputc (C : Integer; Stream : File_Ptr);
@@ -306,9 +300,13 @@ package body System.Memory is
             OS_Exit (255);
          end if;
 
-         fwrite ("GMEM DUMP" & ASCII.LF, 10, 1, Gmemfile);
-         fwrite (Timestamp'Address, Duration'Max_Size_In_Storage_Elements, 1,
-                 Gmemfile);
+         declare
+            S : constant String := "GMEM DUMP" & ASCII.LF;
+         begin
+            fwrite (S'Address, S'Length, 1, Gmemfile);
+            fwrite (Timestamp'Address, Duration'Max_Size_In_Storage_Elements,
+                    1, Gmemfile);
+         end;
       end if;
    end Gmem_Initialize;