diff options
author | Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> | 2003-10-22 11:34:08 +0000 |
---|---|---|
committer | Rainer Orth <ro@gcc.gnu.org> | 2003-10-22 11:34:08 +0000 |
commit | e97c30aaa713e64309e3c0df2592f56e2a26e70e (patch) | |
tree | 15356489fa1f74b9b8263ca9e7e94c4357f48b28 /gcc/ada/cstreams.c | |
parent | 907393db60581bbcfd8a1601027f0761245340c2 (diff) | |
download | gcc-e97c30aaa713e64309e3c0df2592f56e2a26e70e.zip gcc-e97c30aaa713e64309e3c0df2592f56e2a26e70e.tar.gz gcc-e97c30aaa713e64309e3c0df2592f56e2a26e70e.tar.bz2 |
tracebak.c (MAX): Avoid redefinition warning.
* tracebak.c (MAX): Avoid redefinition warning.
* init.c [sgi] (__gnat_error_handler): Remove i, unused.
Change msg to const char *.
(__gnat_install_handler): Remove ss, unused.
[sun && __SVR4 && !__vxworks] (__gnat_error_handler): Change msg
to const char *.
* cstreams.c (__gnat_full_name): Declare p only when used.
(__gnat_full_name) [sgi] Return buffer.
From-SVN: r72794
Diffstat (limited to 'gcc/ada/cstreams.c')
-rw-r--r-- | gcc/ada/cstreams.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gcc/ada/cstreams.c b/gcc/ada/cstreams.c index 0e85c09..755b6b5 100644 --- a/gcc/ada/cstreams.c +++ b/gcc/ada/cstreams.c @@ -162,9 +162,9 @@ __gnat_full_name (nam, buffer) char *nam; char *buffer; { +#if defined(__EMX__) || defined (__MINGW32__) char *p; -#if defined(__EMX__) || defined (__MINGW32__) /* If this is a device file return it as is; under Windows NT and OS/2 a device file end with ":". */ if (nam[strlen (nam) - 1] == ':') @@ -189,6 +189,7 @@ __gnat_full_name (nam, buffer) getcwd approach instead. */ realpath (nam, buffer); + return buffer; #elif defined (VMS) strncpy (buffer, __gnat_to_canonical_file_spec (nam), __gnat_max_path_len); @@ -209,6 +210,8 @@ __gnat_full_name (nam, buffer) return buffer; #else + char *p; + if (nam[0] != '/') { p = getcwd (buffer, __gnat_max_path_len); |