From 5e09921a56e95839609142dfa16ee7e4f01d1bf1 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Tue, 27 Dec 2011 10:51:53 +0100
Subject: [PATCH] Bug 712584 - Properly use .def files on mingw builds r=khuey

---
 config/rules.mk                 | 7 +++++++
 js/src/config/rules.mk          | 7 +++++++
 memory/mozutils/mozutils.def.in | 2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/config/rules.mk b/config/rules.mk
index 4b8ae1f9f7c7f..546475a51e4ca 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -373,6 +373,13 @@ ifdef MAPFILE
 OS_LDFLAGS += -MAP:$(MAPFILE)
 endif
 
+else #!GNU_CC
+
+ifdef DEFFILE
+OS_LDFLAGS += $(call normalizepath,$(DEFFILE))
+EXTRA_DEPS += $(DEFFILE)
+endif
+
 endif # !GNU_CC
 
 endif # WINNT
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index 4b8ae1f9f7c7f..546475a51e4ca 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -373,6 +373,13 @@ ifdef MAPFILE
 OS_LDFLAGS += -MAP:$(MAPFILE)
 endif
 
+else #!GNU_CC
+
+ifdef DEFFILE
+OS_LDFLAGS += $(call normalizepath,$(DEFFILE))
+EXTRA_DEPS += $(DEFFILE)
+endif
+
 endif # !GNU_CC
 
 endif # WINNT
diff --git a/memory/mozutils/mozutils.def.in b/memory/mozutils/mozutils.def.in
index 3bbc3bf09eedc..63cd6dc952a16 100644
--- a/memory/mozutils/mozutils.def.in
+++ b/memory/mozutils/mozutils.def.in
@@ -1,4 +1,4 @@
-; ***** BEGIN LICENSE BLOCK *****
+; ***** BEGIN LICENSE BLOCK *****
 ; Version: MPL 1.1/GPL 2.0/LGPL 2.1
 ;
 ; The contents of this file are subject to the Mozilla Public License Version