From 3757389d74f752a5ddb489ee6fb6aa2932cbfd76 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 15 Nov 2010 15:16:34 -0500
Subject: [PATCH] Bug 612356 - Add NS_SetDllDirectory to dlldeps.cpp; r=khuey
 a=NPOTB

---
 toolkit/library/libxul-config.mk | 2 ++
 xpcom/build/dlldeps.cpp          | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/toolkit/library/libxul-config.mk b/toolkit/library/libxul-config.mk
index d93001dd415..839343fa442 100644
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -61,6 +61,7 @@ CPPSRCS += dlldeps-zlib.cpp
 endif
 
 LOCAL_INCLUDES += -I$(topsrcdir)/widget/src/windows
+LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
 endif
 
 ifneq (,$(filter WINNT OS2,$(OS_ARCH)))
@@ -86,6 +87,7 @@ RCFLAGS += -i $(topsrcdir)/widget/src/os2
 endif
 
 LOCAL_INCLUDES += -I$(topsrcdir)/widget/src/os2
+LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
 endif
 
 # dependent libraries
diff --git a/xpcom/build/dlldeps.cpp b/xpcom/build/dlldeps.cpp
index ec5701323a7..2b61139ba22 100644
--- a/xpcom/build/dlldeps.cpp
+++ b/xpcom/build/dlldeps.cpp
@@ -41,6 +41,7 @@
 #ifdef XP_WIN
 #include <windows.h>
 #include "nsWindowsRegKey.h"
+#include "nsSetDllDirectory.h"
 #ifdef DEBUG
 #include "pure.h"
 #endif
@@ -281,6 +282,7 @@ void XXXNeverCalled()
     sXPCOMHasLoadedNewDLLs = !sXPCOMHasLoadedNewDLLs;
     NS_SetHasLoadedNewDLLs();
     NS_NewWindowsRegKey(nsnull);
+    NS_SetDllDirectory(nsnull);
 #if defined (DEBUG) && !defined (WINCE)
     PurePrintf(0);
 #endif