mozilla-central: changeset 90725:6a45337b5ed6a6e3689ec2ab1e444acb17392bd8

author	Jacek Caban <jacek@codeweavers.com>
	Fri, 30 Mar 2012 13:33:06 +0200
changeset 90725	6a45337b5ed6a6e3689ec2ab1e444acb17392bd8
parent 90724	2c4ec30ee406ca847eed74b259fc8a44cac0f053
child 90726	d5a7628eed875905a4b3b8f7860c97a04dfb7355
push id	22382
push user	bmo@edmorley.co.uk
push date	Sat, 31 Mar 2012 21:44:34 +0000
treeherder	mozilla-central@bbe5086163c9 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	jimm
bugs	739919
milestone	14.0a1
first release with	nightly linux32 bbe5086163c9 / 14.0a1 / 20120331161857 / files nightly linux64 bbe5086163c9 / 14.0a1 / 20120331161857 / files nightly mac bbe5086163c9 / 14.0a1 / 20120331161857 / files nightly win32 bbe5086163c9 / 14.0a1 / 20120331161857 / files nightly win64 bbe5086163c9 / 14.0a1 / 20120331161857 / files
last release without	nightly linux32 92fe907ddac8 / 14.0a1 / 20120330031146 / files nightly linux64 92fe907ddac8 / 14.0a1 / 20120330031146 / files nightly mac 92fe907ddac8 / 14.0a1 / 20120330031146 / files nightly win32 92fe907ddac8 / 14.0a1 / 20120330031146 / files nightly win64 92fe907ddac8 / 14.0a1 / 20120330031146 / files

--- a/browser/components/build/Makefile.in
+++ b/browser/components/build/Makefile.in
@@ -19,17 +19,17 @@ USE_STATIC_LIBS = 1
 endif
 
 EXPORTS = nsBrowserCompsCID.h
 
 CPPSRCS = nsModule.cpp \
           $(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
-OS_LIBS	+= $(call EXPAND_LIBNAME,ole32 shell32)
+OS_LIBS	+= $(call EXPAND_LIBNAME,ole32 shell32 shlwapi)
 endif
 
 LOCAL_INCLUDES = \
 	-I$(srcdir)/../shell/src \
 	-I$(srcdir)/../feeds/src \
 	-I$(srcdir)/../privatebrowsing/src \
 	-I$(srcdir)/../about \
 	-I$(srcdir)/../dirprovider \

--- a/browser/components/shell/src/nsWindowsShellService.cpp
+++ b/browser/components/shell/src/nsWindowsShellService.cpp
@@ -72,18 +72,16 @@
 
 #ifdef _WIN32_WINNT
 #undef _WIN32_WINNT
 #endif
 #define _WIN32_WINNT 0x0600
 #define INITGUID
 #include <shlobj.h>
 
-#pragma comment(lib, "shlwapi.lib") // for SHDeleteKeyW
-
 #include <mbstring.h>
 #include <shlwapi.h>
 
 #ifndef MAX_BUF
 #define MAX_BUF 4096
 #endif
 
 #define REG_SUCCEEDED(val) \

browser/components/build/Makefile.in		file \| annotate \| diff \| comparison \| revisions
browser/components/shell/src/nsWindowsShellService.cpp		file \| annotate \| diff \| comparison \| revisions