OSDN Git Service

* prims.cc (_Jv_PrependVersionedLibdir): Use
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 10 Oct 2006 18:46:41 +0000 (18:46 +0000)
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 10 Oct 2006 18:46:41 +0000 (18:46 +0000)
_Jv_platform_path_separator.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@117611 138bc75d-0d04-0410-961f-82ee72b054a4

libjava/ChangeLog
libjava/prims.cc

index 8fbeb58..b1853f4 100644 (file)
@@ -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.
index 3db82c1..dfeb957 100644 (file)
@@ -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);
         }
     }