Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 612356 - Add NS_SetDllDirectory to dlldeps.cpp; r=khuey a=NPOTB

Browse Source
This commit is contained in:
Ehsan Akhgari 2010-11-15 15:16:34 -05:00
parent 0a5c99ffc3
commit 2d8fda0962
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolkit/library/libxul-config.mk
View File

@ -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

2
xpcom/build/dlldeps.cpp
View File

@ -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