Further minor fixes

gcc/ada/
	* gnatvsn.adb (Version_String): Rename to...
	(C_Version_String): ...this.
	(Gnat_Version_String): Adjust to above renaming.
	* version.c : Fix formatting glitches.

diff --git a/gcc/ada/gnatvsn.adb b/gcc/ada/gnatvsn.adb
index d6d2a5a3ace34564db7a9153bbc127e729624b16..d585c645b5215ffdc980fd3a112267d9cf06939e 100644 (file)
--- a/gcc/ada/gnatvsn.adb
+++ b/gcc/ada/gnatvsn.adb
@@ -48,12 +48,11 @@ package body Gnatvsn is
    end Gnat_Free_Software;
 
    type char_array is array (Natural range <>) of aliased Character;
-   Version_String : char_array (0 .. Ver_Len_Max - 1);
-   --  Import the C string defined in the (language-independent) source file
-   --  version.c using the zero-based convention of the C language.
-   --  The size is not the real one, which does not matter since we will
-   --  check for the nul character in Gnat_Version_String.
-   pragma Import (C, Version_String, "gnat_version_string");
+   C_Version_String : char_array (0 .. Ver_Len_Max - 1);
+   pragma Import (C, C_Version_String, "gnat_version_string");
+   --  Import the C string defined in the source file version.c using the
+   --  zero-based convention of the C language.  The size is not the real
+   --  one, which does not matter since we will check for the nul character.
 
    -------------------------
    -- Gnat_Version_String --
@@ -64,9 +63,9 @@ package body Gnatvsn is
       Pos : Natural := 0;
    begin
       loop
-         exit when Version_String (Pos) = ASCII.NUL;
+         exit when C_Version_String (Pos) = ASCII.NUL;
 
-         S (Pos + 1) := Version_String (Pos);
+         S (Pos + 1) := C_Version_String (Pos);
          Pos := Pos + 1;
 
          exit when Pos = Ver_Len_Max;

diff --git a/gcc/ada/version.c b/gcc/ada/version.c
index e6cc612404001b8f0e537032c69f560e48f568e0..5e64edd0b17d39e3008c970c3699ed348590f893 100644 (file)
--- a/gcc/ada/version.c
+++ b/gcc/ada/version.c
@@ -2,11 +2,11 @@
  *                                                                          *
  *                         GNAT COMPILER COMPONENTS                         *
  *                                                                          *
- *                             V E R S I O N                               *
+ *                              V E R S I O N                               *
  *                                                                          *
  *                          C Implementation File                           *
  *                                                                          *
- *          Copyright (C) 2021, Free Software Foundation, Inc.         *
+ *            Copyright (C) 2021, Free Software Foundation, Inc.            *
  *                                                                          *
  * GNAT is free software;  you can  redistribute it  and/or modify it under *
  * terms of the  GNU General Public License as published  by the Free Soft- *