Bug 405368 - "Allow runtime overrides by Linux version for chrome" [p=ventnor.bugzilla@yahoo.com.au (Michael Ventnor) r=bsmedberg a1.9=beltzner]
git-svn-id: svn://10.0.0.236/trunk@240073 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
ac9d81a10c
commit
e3f12fc3f9
@ -86,9 +86,17 @@ EXTRA_DSO_LDOPTS = \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
|
||||
endif
|
||||
|
||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||
EXTRA_DSO_LDOPTS += $(TK_LIBS)
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
|
||||
CXXFLAGS += $(MOZ_GTK2_CFLAGS)
|
||||
endif
|
||||
|
||||
|
||||
@ -48,6 +48,8 @@
|
||||
#include <windows.h>
|
||||
#elif defined(XP_MACOSX)
|
||||
#include <Carbon/Carbon.h>
|
||||
#elif defined(MOZ_WIDGET_GTK2)
|
||||
#include <gtk/gtk.h>
|
||||
#endif
|
||||
|
||||
#include "nsAppDirectoryServiceDefs.h"
|
||||
@ -2143,6 +2145,10 @@ nsChromeRegistry::ProcessManifestBuffer(char *buf, PRInt32 length,
|
||||
majorVersion,
|
||||
minorVersion);
|
||||
}
|
||||
#elif defined(MOZ_WIDGET_GTK2)
|
||||
nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(),
|
||||
gtk_major_version,
|
||||
gtk_minor_version);
|
||||
#endif
|
||||
|
||||
char *token;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user