From 40e7ef503495cbad7755bc7c3a55adc8efbe6607 Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Sun, 19 Feb 2006 07:43:19 +0000 Subject: [PATCH] Fix mingw cross-compile bustage. Original patch by . Bug #320646 r=cls git-svn-id: svn://10.0.0.236/trunk@190537 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/toolkit/library/Makefile.in | 2 +- mozilla/widget/src/build/Makefile.in | 4 ++-- mozilla/xpcom/base/nsUUIDGenerator.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/toolkit/library/Makefile.in b/mozilla/toolkit/library/Makefile.in index 11251ce7a0d..e0b3c2bf171 100644 --- a/mozilla/toolkit/library/Makefile.in +++ b/mozilla/toolkit/library/Makefile.in @@ -154,7 +154,7 @@ EXTRA_DSO_LDOPTS += -lbe -ltracker endif ifeq ($(OS_ARCH),WINNT) -EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool Comdlg32) +EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32) ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC)) EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,imagehlp) endif diff --git a/mozilla/widget/src/build/Makefile.in b/mozilla/widget/src/build/Makefile.in index e50e32305cb..cb84fa73e2a 100644 --- a/mozilla/widget/src/build/Makefile.in +++ b/mozilla/widget/src/build/Makefile.in @@ -76,10 +76,10 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../windows \ $(NULL) -OS_LIBS += $(call EXPAND_LIBNAME, uuid ole32 oleaut32 Winspool) +OS_LIBS += $(call EXPAND_LIBNAME, uuid ole32 oleaut32 winspool) ifneq ($(OS_ARCH), WINCE) -OS_LIBS += $(call EXPAND_LIBNAME, comctl32 comdlg32 shell32 gdi32 imm32 Winspool ) +OS_LIBS += $(call EXPAND_LIBNAME, comctl32 comdlg32 shell32 gdi32 imm32) endif SHARED_LIBRARY_LIBS = \ diff --git a/mozilla/xpcom/base/nsUUIDGenerator.cpp b/mozilla/xpcom/base/nsUUIDGenerator.cpp index 7458a26bca4..201edfb5486 100644 --- a/mozilla/xpcom/base/nsUUIDGenerator.cpp +++ b/mozilla/xpcom/base/nsUUIDGenerator.cpp @@ -38,7 +38,7 @@ #ifdef XP_WIN #include -#include +#include #else #include #endif