From 99d738b533ba324c05fa2e2a25f758767a2541da Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Fri, 22 Nov 2013 10:56:15 -0500 Subject: [PATCH] Backed out changeset b0a4653325cc (bug 941565) for Windows bustage. CLOSED TREE --- dom/system/OSFileConstants.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dom/system/OSFileConstants.cpp b/dom/system/OSFileConstants.cpp index f794635fbcc1..f1888000e54f 100644 --- a/dom/system/OSFileConstants.cpp +++ b/dom/system/OSFileConstants.cpp @@ -809,16 +809,17 @@ bool DefineOSFileConstants(JSContext *cx, JS::Handle global) } // Locate libxul - // Note that we don't actually provide the full path, only the name of the - // library, which is sufficient to link to the library using js-ctypes. { + nsAutoString xulPath(gPaths->libDir); + + xulPath.Append(PR_GetDirectorySeparator()); + #if defined(XP_MACOSX) // Under MacOS X, for some reason, libxul is called simply "XUL" - nsAutoString xulPath(NS_LITERAL_STRING("XUL")); + xulPath.Append(NS_LITERAL_STRING("XUL")); #else // On other platforms, libxul is a library "xul" with regular // library prefix/suffix - nsAutoString xulPath(); xulPath.Append(NS_LITERAL_STRING(DLL_PREFIX)); xulPath.Append(NS_LITERAL_STRING("xul")); xulPath.Append(NS_LITERAL_STRING(DLL_SUFFIX));