From c725727628e93f33a81d2570fb5465ef2ab6dcae Mon Sep 17 00:00:00 2001 From: "duncan%be.com" Date: Fri, 3 Sep 1999 12:54:05 +0000 Subject: [PATCH] A bunch of things to get the BeOS build to work. Mostly BeOS specific fixes, except for the change to nsinstall.c that ignores trailing "/." in the function mkdirs (as creating a "." dir fails under BeOS). git-svn-id: svn://10.0.0.236/trunk@45881 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/config/nsinstall.c | 6 + mozilla/config/rules.mk | 4 +- mozilla/widget/src/beos/Makefile.in | 2 - mozilla/widget/src/beos/nsMenu.cpp | 21 ++- mozilla/widget/src/beos/nsMenu.h | 1 + mozilla/widget/src/beos/nsMenuItem.cpp | 12 ++ mozilla/widget/src/beos/nsMenuItem.h | 2 + mozilla/widget/src/beos/nsStringUtil.h | 79 ----------- mozilla/widget/src/beos/nsTabWidget.cpp | 134 ------------------ mozilla/widget/src/beos/nsTabWidget.h | 55 ------- mozilla/widget/src/beos/nsTooltipWidget.cpp | 107 -------------- mozilla/widget/src/beos/nsTooltipWidget.h | 51 ------- mozilla/widget/src/beos/nsWidgetFactory.cpp | 2 - mozilla/widget/timer/src/beos/Makefile.in | 8 +- mozilla/xpcom/io/nsSpecialSystemDirectory.cpp | 1 + 15 files changed, 44 insertions(+), 441 deletions(-) delete mode 100644 mozilla/widget/src/beos/nsStringUtil.h delete mode 100644 mozilla/widget/src/beos/nsTabWidget.cpp delete mode 100644 mozilla/widget/src/beos/nsTabWidget.h delete mode 100644 mozilla/widget/src/beos/nsTooltipWidget.cpp delete mode 100644 mozilla/widget/src/beos/nsTooltipWidget.h diff --git a/mozilla/config/nsinstall.c b/mozilla/config/nsinstall.c index 24b80347588..848bd80371c 100644 --- a/mozilla/config/nsinstall.c +++ b/mozilla/config/nsinstall.c @@ -116,6 +116,12 @@ mkdirs(char *path, mode_t mode) char *cp; struct stat sb; int res; + int l; + + /* strip trailing "/." */ + l = strlen(path); + if(l > 1 && path[l - 1] == '.' && path[l - 2] == '/') + path[l - 2] = 0; while (*path == '/' && path[1] == '/') path++; diff --git a/mozilla/config/rules.mk b/mozilla/config/rules.mk index 5d22958cf61..77997e3b570 100644 --- a/mozilla/config/rules.mk +++ b/mozilla/config/rules.mk @@ -439,9 +439,9 @@ ifdef SHARED_LIBRARY # BeOS specific section: link against dependant shared libs # BEOS_LIB_LIST = $(shell cat $(topsrcdir)/dependencies.beos/$(LIBRARY_NAME).dependencies) -BEOS_LINK_LIBS = $(foreach lib,$(BEOS_LIB_LIST),$(shell $(topsrcdir)/config/beos/checklib.sh $(DIST)/bin $(lib))) $(shell $(topsrcdir)/config/beos/appstub.sh $(DIST)/bin) +BEOS_LINK_LIBS = $(foreach lib,$(BEOS_LIB_LIST),$(shell $(topsrcdir)/config/beos/checklib.sh $(DIST)/bin $(lib))) LDFLAGS += -L$(DIST)/bin $(BEOS_LINK_LIBS) $(NSPR_LIBS) -EXTRA_DSO_LDOPTS += -L$(DIST)/bin $(BEOS_LINK_LIBS) $(NSPR_LIBS) $(DIST)/bin/_APP_ +EXTRA_DSO_LDOPTS += -L$(DIST)/bin $(BEOS_LINK_LIBS) $(NSPR_LIBS) endif endif diff --git a/mozilla/widget/src/beos/Makefile.in b/mozilla/widget/src/beos/Makefile.in index da8c9f669d0..64b79164d08 100644 --- a/mozilla/widget/src/beos/Makefile.in +++ b/mozilla/widget/src/beos/Makefile.in @@ -53,12 +53,10 @@ CPPSRCS = \ nsRadioButton.cpp \ nsScrollbar.cpp \ nsSound.cpp \ - nsTabWidget.cpp \ nsTextAreaWidget.cpp\ nsTextHelper.cpp \ nsTextWidget.cpp \ nsToolkit.cpp \ - nsTooltipWidget.cpp \ nsWidgetFactory.cpp \ nsWindow.cpp \ $(NULL) diff --git a/mozilla/widget/src/beos/nsMenu.cpp b/mozilla/widget/src/beos/nsMenu.cpp index 0f9c10d62f1..190b0ae3cf2 100644 --- a/mozilla/widget/src/beos/nsMenu.cpp +++ b/mozilla/widget/src/beos/nsMenu.cpp @@ -173,6 +173,16 @@ NS_METHOD nsMenu::SetAccessKey(const nsString &aText) return NS_OK; } +//------------------------------------------------------------------------- +/** +* Set enabled state +* +*/ +NS_METHOD nsMenu::SetEnabled(PRBool aIsEnabled) +{ + return NS_OK; +} + //------------------------------------------------------------------------- NS_METHOD nsMenu::AddItem(nsISupports * aItem) { @@ -357,6 +367,12 @@ NS_METHOD nsMenu::GetNativeData(void ** aData) return NS_OK; } +//------------------------------------------------------------------------- +NS_METHOD nsMenu::SetNativeData(void * aData) +{ + return NS_OK; +} + //------------------------------------------------------------------------- NS_METHOD nsMenu::AddMenuListener(nsIMenuListener * aMenuListener) { @@ -374,11 +390,6 @@ NS_METHOD nsMenu::RemoveMenuListener(nsIMenuListener * aMenuListener) return NS_OK; } -NS_METHOD nsMenu::SetEnabled(PRBool aIsEnabled) -{ - return NS_OK; -} - //------------------------------------------------------------------------- // nsIMenuListener interface //------------------------------------------------------------------------- diff --git a/mozilla/widget/src/beos/nsMenu.h b/mozilla/widget/src/beos/nsMenu.h index 04d09e8e7d3..f365bd5fe21 100644 --- a/mozilla/widget/src/beos/nsMenu.h +++ b/mozilla/widget/src/beos/nsMenu.h @@ -71,6 +71,7 @@ public: NS_IMETHOD RemoveItem(const PRUint32 aPos); NS_IMETHOD RemoveAll(); NS_IMETHOD GetNativeData(void** aData); + NS_IMETHOD SetNativeData(void * aData); NS_IMETHOD AddMenuListener(nsIMenuListener * aMenuListener); NS_IMETHOD RemoveMenuListener(nsIMenuListener * aMenuListener); NS_IMETHOD SetEnabled(PRBool aIsEnabled); diff --git a/mozilla/widget/src/beos/nsMenuItem.cpp b/mozilla/widget/src/beos/nsMenuItem.cpp index 79941748be7..06a3d9ac408 100644 --- a/mozilla/widget/src/beos/nsMenuItem.cpp +++ b/mozilla/widget/src/beos/nsMenuItem.cpp @@ -417,6 +417,18 @@ NS_METHOD nsMenuItem::DoCommand() return rv; } +//------------------------------------------------------------------------- +NS_METHOD nsMenuItem::SetDOMNode(nsIDOMNode * aDOMNode) +{ + return NS_OK; +} + +//------------------------------------------------------------------------- +NS_METHOD nsMenuItem::GetDOMNode(nsIDOMNode ** aDOMNode) +{ + return NS_OK; +} + //------------------------------------------------------------------------- NS_METHOD nsMenuItem::SetDOMElement(nsIDOMElement * aDOMElement) { diff --git a/mozilla/widget/src/beos/nsMenuItem.h b/mozilla/widget/src/beos/nsMenuItem.h index 6ba199e5f3f..93b3e0d0a4c 100644 --- a/mozilla/widget/src/beos/nsMenuItem.h +++ b/mozilla/widget/src/beos/nsMenuItem.h @@ -67,6 +67,8 @@ public: NS_IMETHOD SetCommand(const nsString & aStrCmd); NS_IMETHOD DoCommand(); + NS_IMETHOD SetDOMNode(nsIDOMNode * aDOMNode); + NS_IMETHOD GetDOMNode(nsIDOMNode ** aDOMNode); NS_IMETHOD SetDOMElement(nsIDOMElement * aDOMElement); NS_IMETHOD GetDOMElement(nsIDOMElement ** aDOMElement); NS_IMETHOD SetWebShell(nsIWebShell * aWebShell); diff --git a/mozilla/widget/src/beos/nsStringUtil.h b/mozilla/widget/src/beos/nsStringUtil.h deleted file mode 100644 index 4925500ba78..00000000000 --- a/mozilla/widget/src/beos/nsStringUtil.h +++ /dev/null @@ -1,79 +0,0 @@ -/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */ -/* - * The contents of this file are subject to the Netscape Public License - * Version 1.0 (the "NPL"); you may not use this file except in - * compliance with the NPL. You may obtain a copy of the NPL at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the NPL is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL - * for the specific language governing rights and limitations under the - * NPL. - * - * The Initial Developer of this code under the NPL is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All Rights - * Reserved. - */ - -// Convience macros for converting nsString's to chars + -// creating temporary char[] bufs. - -#ifndef NS_STR_UTIL_H -#define NS_STR_UTIL_H - -// nsString to temporary char[] macro - -// Convience MACROS to convert an nsString to a char * which use a -// static char array if possible to reduce memory fragmentation, -// otherwise they allocate a char[] which must be freed. -// REMEMBER to always use the NS_FREE_STR_BUF after using the -// NS_ALLOC_STR_BUF. You can not nest NS_ALLOC_STR_BUF's. - -#define NS_ALLOC_STR_BUF(varName, strName, tempSize) \ - static const int _ns_kSmallBufferSize = tempSize; \ - char* varName = 0; \ - int _ns_smallBufUsed = 0; \ - char _ns_smallBuffer[_ns_kSmallBufferSize]; \ - if (strName.Length() < (_ns_kSmallBufferSize - 1)) { \ - strName.ToCString(_ns_smallBuffer, _ns_kSmallBufferSize); \ - _ns_smallBuffer[_ns_kSmallBufferSize - 1] = '\0'; \ - _ns_smallBufUsed = 1; \ - varName = _ns_smallBuffer; \ - } \ - else { \ - varName = strName.ToNewCString(); \ - } - -#define NS_FREE_STR_BUF(varName) \ - if (! _ns_smallBufUsed) \ - delete varName; - -// Create temporary char[] macro -// -// Create a temporary buffer for storing chars. -// If the actual size is > size then the buffer -// is allocated from the heap, otherwise the buffer -// is a stack variable. REMEMBER: use NS_FREE_BUF -// when finished with the buffer allocated, and do -// NOT nest INSERT_BUF'S. - -#define NS_ALLOC_CHAR_BUF(aBuf, aSize, aActualSize) \ - char *aBuf; \ - int _ns_smallBufUsed = 0; \ - static const int _ns_kSmallBufferSize = aSize; \ - if (aActualSize < _ns_kSmallBufferSize) { \ - char _ns_smallBuffer[_ns_kSmallBufferSize]; \ - aBuf = _ns_smallBuffer; \ - _ns_smallBufUsed = 1; \ - } \ - else { \ - aBuf = new char[aActualSize]; \ - } - -#define NS_FREE_CHAR_BUF(aBuf) \ -if (! _ns_smallBufUsed) \ - delete aBuf; - - -#endif // NSStringUtil \ No newline at end of file diff --git a/mozilla/widget/src/beos/nsTabWidget.cpp b/mozilla/widget/src/beos/nsTabWidget.cpp deleted file mode 100644 index 3bd02abc408..00000000000 --- a/mozilla/widget/src/beos/nsTabWidget.cpp +++ /dev/null @@ -1,134 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Netscape Public License - * Version 1.0 (the "NPL"); you may not use this file except in - * compliance with the NPL. You may obtain a copy of the NPL at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the NPL is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL - * for the specific language governing rights and limitations under the - * NPL. - * - * The Initial Developer of this code under the NPL is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All Rights - * Reserved. - */ - -#include "nsTabWidget.h" -#include "nsToolkit.h" -#include "nsColor.h" -#include "nsGUIEvent.h" -#include "nsString.h" -#include "nsStringUtil.h" - - -NS_IMPL_ADDREF(nsTabWidget) -NS_IMPL_RELEASE(nsTabWidget) - -//------------------------------------------------------------------------- -// -// nsTabWidget constructor -// -//------------------------------------------------------------------------- -nsTabWidget::nsTabWidget() : nsWindow() -{ - NS_INIT_REFCNT(); - // Ensure that common controls dll is loaded -#if 0 - InitCommonControls(); -#endif -} - -//------------------------------------------------------------------------- -// -// nsTabWidget destructor -// -//------------------------------------------------------------------------- -nsTabWidget::~nsTabWidget() -{ -} - -//------------------------------------------------------------------------- -// -// Query interface implementation -// -//------------------------------------------------------------------------- -nsresult nsTabWidget::QueryInterface(const nsIID& aIID, void** aInstancePtr) -{ - nsresult result = nsWindow::QueryInterface(aIID, aInstancePtr); - - static NS_DEFINE_IID(kInsTabWidgetIID, NS_ITABWIDGET_IID); - if (result == NS_NOINTERFACE && aIID.Equals(kInsTabWidgetIID)) { - *aInstancePtr = (void*) ((nsITabWidget*)this); - NS_ADDREF_THIS(); - result = NS_OK; - } - - return result; -} - -//------------------------------------------------------------------------- -// -// Set the tab labels -// -//------------------------------------------------------------------------- - -NS_METHOD nsTabWidget::SetTabs(PRUint32 aNumberOfTabs, const nsString aTabLabels[]) -{ -#if 0 - TC_ITEM tie; - char labelTemp[256]; - - for (PRUint32 i = 0; i < aNumberOfTabs; i++) { - tie.mask = TCIF_TEXT; - aTabLabels[i].ToCString(labelTemp, 256); - tie.pszText = labelTemp; - TabCtrl_InsertItem(mWnd, i, &tie); - } -#endif - return NS_OK; -} - -//------------------------------------------------------------------------- -// -// Get the currently selected tab -// -//------------------------------------------------------------------------- - - -PRUint32 nsTabWidget::GetSelectedTab(PRUint32& aTabNumber) -{ -#if 0 - aTabNumber = TabCtrl_GetCurSel(mWnd); -#endif - return NS_OK; -} - -//------------------------------------------------------------------------- -// -// paint message. Don't send the paint out -// -//------------------------------------------------------------------------- -PRBool nsTabWidget::OnPaint(nsRect &r) -{ - return PR_FALSE; -} - -PRBool nsTabWidget::OnResize(nsRect &aWindowRect) -{ - return PR_FALSE; -} - -//------------------------------------------------------------------------- -// -// get position/dimensions -// -//------------------------------------------------------------------------- - -NS_METHOD nsTabWidget::GetBounds(nsRect &aRect) -{ - return nsWindow::GetBounds(aRect); -} - diff --git a/mozilla/widget/src/beos/nsTabWidget.h b/mozilla/widget/src/beos/nsTabWidget.h deleted file mode 100644 index f7432d3fb1a..00000000000 --- a/mozilla/widget/src/beos/nsTabWidget.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Netscape Public License - * Version 1.0 (the "NPL"); you may not use this file except in - * compliance with the NPL. You may obtain a copy of the NPL at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the NPL is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL - * for the specific language governing rights and limitations under the - * NPL. - * - * The Initial Developer of this code under the NPL is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All Rights - * Reserved. - */ - -#ifndef nsTabWidget_h__ -#define nsTabWidget_h__ - -#include "nsdefs.h" -#include "nsWindow.h" -#include "nsSwitchToUIThread.h" - -#include "nsITabWidget.h" - -/** - * Native Win32 tab control wrapper - */ - -class nsTabWidget : public nsWindow, - public nsITabWidget -{ - -public: - nsTabWidget(); - virtual ~nsTabWidget(); - - // nsISupports - NS_IMETHOD_(nsrefcnt) Release(void); - NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr); - NS_IMETHOD_(nsrefcnt) AddRef(void); - - // nsITabWidget part - NS_IMETHOD SetTabs(PRUint32 aNumberOfTabs, const nsString aTabLabels[]); - NS_IMETHOD GetSelectedTab(PRUint32& aTabNumber); - - // nsIWidget overrides - virtual PRBool OnPaint(nsRect &r); - virtual PRBool OnResize(nsRect &aWindowRect); - NS_IMETHOD GetBounds(nsRect &aRect); -}; - -#endif // nsTabWidget_h__ diff --git a/mozilla/widget/src/beos/nsTooltipWidget.cpp b/mozilla/widget/src/beos/nsTooltipWidget.cpp deleted file mode 100644 index d7fdee7d33b..00000000000 --- a/mozilla/widget/src/beos/nsTooltipWidget.cpp +++ /dev/null @@ -1,107 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Netscape Public License - * Version 1.0 (the "NPL"); you may not use this file except in - * compliance with the NPL. You may obtain a copy of the NPL at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the NPL is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL - * for the specific language governing rights and limitations under the - * NPL. - * - * The Initial Developer of this code under the NPL is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All Rights - * Reserved. - */ - -#include "nsTooltipWidget.h" -#include "nsToolkit.h" -#include "nsColor.h" -#include "nsGUIEvent.h" -#include "nsString.h" -#include "nsStringUtil.h" - - -NS_IMPL_ADDREF(nsTooltipWidget) -NS_IMPL_RELEASE(nsTooltipWidget) - -//------------------------------------------------------------------------- -// -// nsTooltipWidget constructor -// -//------------------------------------------------------------------------- -nsTooltipWidget::nsTooltipWidget() -{ - NS_INIT_REFCNT(); -} - -//------------------------------------------------------------------------- -// -// nsTooltipWidget destructor -// -//------------------------------------------------------------------------- -nsTooltipWidget::~nsTooltipWidget() -{ -} - -//------------------------------------------------------------------------- -// -// Query interface implementation -// -//------------------------------------------------------------------------- -nsresult nsTooltipWidget::QueryInterface(const nsIID& aIID, void** aInstancePtr) -{ - nsresult result = nsWindow::QueryInterface(aIID, aInstancePtr); - - static NS_DEFINE_IID(kInsTooltipWidgetIID, NS_ITOOLTIPWIDGET_IID); - if (result == NS_NOINTERFACE && aIID.Equals(kInsTooltipWidgetIID)) { - *aInstancePtr = (void*) ((nsITooltipWidget*)this); - NS_ADDREF_THIS(); - result = NS_OK; - } - - return result; -} - -//------------------------------------------------------------------------- -// -// paint message. Don't send the paint out -// -//------------------------------------------------------------------------- -PRBool nsTooltipWidget::OnPaint(nsRect &r) -{ - return PR_FALSE; -} - -PRBool nsTooltipWidget::OnResize(nsRect &aWindowRect) -{ - return PR_FALSE; -} - -//------------------------------------------------------------------------- -// -// Clear window before paint -// -//------------------------------------------------------------------------- - -PRBool nsTooltipWidget::AutoErase() -{ - return(PR_TRUE); -} - - -//------------------------------------------------------------------------- -// -// get position/dimensions -// -//------------------------------------------------------------------------- - -NS_METHOD nsTooltipWidget::GetBounds(nsRect &aRect) -{ - return nsWindow::GetBounds(aRect); -} - - - diff --git a/mozilla/widget/src/beos/nsTooltipWidget.h b/mozilla/widget/src/beos/nsTooltipWidget.h deleted file mode 100644 index f4a08b48d36..00000000000 --- a/mozilla/widget/src/beos/nsTooltipWidget.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Netscape Public License - * Version 1.0 (the "NPL"); you may not use this file except in - * compliance with the NPL. You may obtain a copy of the NPL at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the NPL is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL - * for the specific language governing rights and limitations under the - * NPL. - * - * The Initial Developer of this code under the NPL is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All Rights - * Reserved. - */ - -#ifndef nsTooltipWidget_h__ -#define nsTooltipWidget_h__ - -#include "nsdefs.h" -#include "nsWindow.h" -#include "nsSwitchToUIThread.h" - -#include "nsITooltipWidget.h" - -/** - * Native Win32 tooltip window wrapper - */ - -class nsTooltipWidget : public nsWindow, - public nsITooltipWidget -{ - -public: - nsTooltipWidget(); - virtual ~nsTooltipWidget(); - - // nsISupports - NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr); - NS_IMETHOD_(nsrefcnt) AddRef(void); - NS_IMETHOD_(nsrefcnt) Release(void); - - virtual PRBool OnPaint(nsRect &r); - virtual PRBool OnResize(nsRect &aWindowRect); - virtual PRBool AutoErase(); - NS_IMETHOD GetBounds(nsRect &aRect); -}; - -#endif // nsTooltipWidget_h__ diff --git a/mozilla/widget/src/beos/nsWidgetFactory.cpp b/mozilla/widget/src/beos/nsWidgetFactory.cpp index 25302d772d9..20836c6a74c 100644 --- a/mozilla/widget/src/beos/nsWidgetFactory.cpp +++ b/mozilla/widget/src/beos/nsWidgetFactory.cpp @@ -42,8 +42,6 @@ #include "nsMenuItem.h" #include "nsPopUpMenu.h" #endif -#include "nsTabWidget.h" -#include "nsTooltipWidget.h" #include "nsFontRetrieverService.h" // Drag & Drop, Clipboard diff --git a/mozilla/widget/timer/src/beos/Makefile.in b/mozilla/widget/timer/src/beos/Makefile.in index 74ad5b8edeb..5a67cbcc1c2 100644 --- a/mozilla/widget/timer/src/beos/Makefile.in +++ b/mozilla/widget/timer/src/beos/Makefile.in @@ -22,7 +22,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = timer_s +LIBRARY_NAME = timer_beos MODULE=timer @@ -36,8 +36,8 @@ CPPSRCS = \ nsTimer.cpp \ $(NULL) -MKSHLIB = -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +#MKSHLIB = +#override NO_SHARED_LIB=1 +#override NO_STATIC_LIB= include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpcom/io/nsSpecialSystemDirectory.cpp b/mozilla/xpcom/io/nsSpecialSystemDirectory.cpp index c9ebcb76dff..932fd9d3d6d 100644 --- a/mozilla/xpcom/io/nsSpecialSystemDirectory.cpp +++ b/mozilla/xpcom/io/nsSpecialSystemDirectory.cpp @@ -48,6 +48,7 @@ #include #include #include +#include "prenv.h" #endif #include "plstr.h"