From 28a52581a99f6a6909c3efa41c68106bebb22e40 Mon Sep 17 00:00:00 2001
From: "blizzard%redhat.com"
 <blizzard%redhat.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 27 Jun 2000 20:54:15 +0000
Subject: [PATCH] build the embedding/base code on unix.  fix trailing newline
 in nsEmbedBase.h and put the thread hack back in until we get a long term
 solution.  bug #43952.  r=adamlock,valeski a=brendan

git-svn-id: svn://10.0.0.236/trunk@73318 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/embedding/base/Makefile.in    | 45 +++++++++++++++++++++++++++
 mozilla/embedding/base/nsEmbedAPI.cpp |  2 +-
 mozilla/embedding/base/nsEmbedAPI.h   |  3 +-
 3 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 mozilla/embedding/base/Makefile.in

diff --git a/mozilla/embedding/base/Makefile.in b/mozilla/embedding/base/Makefile.in
new file mode 100644
index 00000000000..7f963b7ba83
--- /dev/null
+++ b/mozilla/embedding/base/Makefile.in
@@ -0,0 +1,45 @@
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Mozilla browser.
+# 
+# The Initial Developer of the Original Code is Christopher
+# Blizzard.  Portions created by Christopher Blizzard
+# Copyright (C) 1999, Christopher Blizzard.  All Rights Reserved.
+#
+# Contributor(s):
+#
+
+DEPTH           = ../..
+topsrcdir       = @top_srcdir@
+srcdir          = @srcdir@
+VPATH           = @srcdir@
+
+MODULE          = embed_base
+LIBRARY_NAME    = embed_base_s
+
+include $(DEPTH)/config/autoconf.mk
+
+EXPORTS         = \
+                nsEmbedAPI.h \
+                $(NULL)
+
+CPPSRCS         = \
+                nsSetupRegistry.cpp \
+                nsEmbedAPI.cpp \
+                $(NULL)
+
+# we don't want the shared lib, but we want to force the creation of a
+# static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/embedding/base/nsEmbedAPI.cpp b/mozilla/embedding/base/nsEmbedAPI.cpp
index 34c99628888..2b50d4deec0 100644
--- a/mozilla/embedding/base/nsEmbedAPI.cpp
+++ b/mozilla/embedding/base/nsEmbedAPI.cpp
@@ -33,7 +33,7 @@ static nsIServiceManager *sServiceManager = nsnull;
 static PRBool             sRegistryInitializedFlag = PR_FALSE;
 static PRUint32           sInitCounter = 0;
 
-//#define HACK_AROUND_THREADING_ISSUES
+#define HACK_AROUND_THREADING_ISSUES
 //#define HACK_AROUND_NONREENTRANT_INITXPCOM
 
 #ifdef HACK_AROUND_NONREENTRANT_INITXPCOM
diff --git a/mozilla/embedding/base/nsEmbedAPI.h b/mozilla/embedding/base/nsEmbedAPI.h
index 89c34e40c11..aeed59898cc 100644
--- a/mozilla/embedding/base/nsEmbedAPI.h
+++ b/mozilla/embedding/base/nsEmbedAPI.h
@@ -31,4 +31,5 @@ extern nsresult NS_InitEmbedding(const char *aPath);
 extern nsresult NS_InitEmbedding(nsILocalFile *aPath);
 extern nsresult NS_TermEmbedding();
 
-#endif
\ No newline at end of file
+#endif
+