From 49a2905076c725d6afa25fc0b5a34e04746fed15 Mon Sep 17 00:00:00 2001 From: tromey Date: Tue, 10 Oct 2006 18:46:41 +0000 Subject: [PATCH] * prims.cc (_Jv_PrependVersionedLibdir): Use _Jv_platform_path_separator. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@117611 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 5 +++++ libjava/prims.cc | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 8fbeb584bcd..b1853f44006 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2006-10-10 Tom Tromey + * prims.cc (_Jv_PrependVersionedLibdir): Use + _Jv_platform_path_separator. + +2006-10-10 Tom Tromey + 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 3db82c19fa7..dfeb95766af 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); } } -- 2.11.0