diff options
| author | Tom Tromey <tromey@redhat.com> | 2006-10-10 18:46:41 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2006-10-10 18:46:41 +0000 |
| commit | ab6b9a13d05d17c29b8a95161d255609703ab29b (patch) | |
| tree | 46bd74f01980d69dcc128f6074dcd1b2c62efbaf /libjava | |
| parent | 51d0a5cc301ae12e47e2152ad1152ecfaec23bad (diff) | |
| download | gcc-ab6b9a13d05d17c29b8a95161d255609703ab29b.zip gcc-ab6b9a13d05d17c29b8a95161d255609703ab29b.tar.gz gcc-ab6b9a13d05d17c29b8a95161d255609703ab29b.tar.bz2 | |
prims.cc (_Jv_PrependVersionedLibdir): Use _Jv_platform_path_separator.
* prims.cc (_Jv_PrependVersionedLibdir): Use
_Jv_platform_path_separator.
From-SVN: r117611
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/prims.cc | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 8fbeb58..b1853f4 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2006-10-10 Tom Tromey <tromey@redhat.com> + * prims.cc (_Jv_PrependVersionedLibdir): Use + _Jv_platform_path_separator. + +2006-10-10 Tom Tromey <tromey@redhat.com> + PR libgcj/29205: * Makefile.in: Rebuilt. * Makefile.am (install-data-local): Install the .pc file. diff --git a/libjava/prims.cc b/libjava/prims.cc index 3db82c1..dfeb957 100644 --- a/libjava/prims.cc +++ b/libjava/prims.cc @@ -1788,11 +1788,14 @@ _Jv_PrependVersionedLibdir (char* libpath) { // LD_LIBRARY_PATH is not prefixed with // GCJ_VERSIONED_LIBDIR. - jsize total = (sizeof (GCJ_VERSIONED_LIBDIR) - 1) - + (sizeof (PATH_SEPARATOR) - 1) + strlen (libpath) + 1; + char path_sep[2]; + path_sep[0] = (char) _Jv_platform_path_separator; + path_sep[1] = '\0'; + jsize total = ((sizeof (GCJ_VERSIONED_LIBDIR) - 1) + + 1 /* path separator */ + strlen (libpath) + 1); retval = (char*) _Jv_Malloc (total); strcpy (retval, GCJ_VERSIONED_LIBDIR); - strcat (retval, PATH_SEPARATOR); + strcat (retval, path_sep); strcat (retval, libpath); } } |