Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-01 05:43:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(I'm moving changes made on the MOZILLA_1_8_BRANCH to HEAD)

Browse Source 
This change is for the QNX (Photon) platform only. It will not affect the
runtime or build of other Mozilla platforms since QNX source is not part of
Tinderbox builds. You can contact me at: mfeil@qnx.com

This change fixes compile errors when building Firefox under QNX Neutrino.
None of the changes should affect non-QNX builds in any way. r=amardare%qnx.com
This commit is contained in:
maxf%magma.ca 2007-03-21 19:22:44 +00:00
parent df9df44f49
commit 4573b68c1a
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
embedding/browser/photon/src/Makefile.in
View File

@ -128,6 +128,11 @@ include $(topsrcdir)/config/rules.mk
CXXFLAGS += $(MOZ_GTK_CFLAGS)
ifneq ($(QCONF_OVERRIDE),)
include $(QCONF_OVERRIDE)
CXXFLAGS += -I$(if $(USE_INSTALL_ROOT),$(INSTALL_ROOT_nto),$(USE_ROOT_nto))/usr/include
endif
ifdef BUILD_STATIC_LIBS
# This is so sick! We'll work backwards from the embedding manifest to

2
embedding/browser/photon/src/PtMozilla.cpp
View File

@ -496,7 +496,7 @@ mozilla_modify( PtWidget_t *widget, PtArg_t const *argt, PtResourceRec_t const *
// get resources function
static int
mozilla_get_info( PtWidget_t *widget, PtArg_t const *argt, PtResourceRec_t const *mod )
mozilla_get_info( PtWidget_t *widget, PtArg_t *argt, PtResourceRec_t const *mod )
{
PtMozillaWidget_t *moz = (PtMozillaWidget_t *) widget;
nsIPref *pref = moz->EmbedRef->GetPrefs();

2
gfx/src/photon/nsDeviceContextSpecPh.cpp
View File

@ -257,7 +257,7 @@ NS_IMETHODIMP nsPrinterEnumeratorPh::GetDefaultPrinterName(PRUnichar * *aDefault
if( pc ) {
PpLoadDefaultPrinter( pc );
PpGetPC( pc, Pp_PC_NAME, &printer );
if( printer ) *aDefaultPrinterName = ToNewUnicode( NS_LITERAL_STRING( printer ) );
if( printer ) *aDefaultPrinterName = ToNewUnicode( NS_STATIC_CAST(const nsAFlatString&, NS_MULTILINE_LITERAL_STRING(printer)) );
PpReleasePC( pc );
}