mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-02 03:49:37 +00:00
Replace NTO with MOZ_WIDGET_PHOTON as necessary.
Thanks to Brian Edmond <briane@qnx.com> for the patch. Bug #119275 r=cls
This commit is contained in:
parent
4580d4de9b
commit
2ae99b0ab6
@ -278,7 +278,7 @@ static const char sWatcherServiceContractID[] = "@mozilla.org/embedcomp/window-w
|
||||
/*********************************************/
|
||||
// Default implemenations for nativeAppSupport
|
||||
// If your platform implements these functions if def out this code.
|
||||
#if !defined (XP_MAC ) && !defined(NTO) && !defined( XP_PC ) && !defined( XP_BEOS ) && !defined(MOZ_WIDGET_GTK)
|
||||
#if !defined (XP_MAC ) && !defined(MOZ_WIDGET_PHOTON) && !defined( XP_PC ) && !defined( XP_BEOS ) && !defined(MOZ_WIDGET_GTK)
|
||||
|
||||
nsresult NS_CreateSplashScreen( nsISplashScreen **aResult )
|
||||
{
|
||||
@ -1468,7 +1468,7 @@ static PRBool GetWantSplashScreen(int argc, char* argv[])
|
||||
int i;
|
||||
PRBool dosplash;
|
||||
// We can't use the command line service here because it isn't running yet
|
||||
#if defined(XP_UNIX) && !defined(NTO)
|
||||
#if defined(XP_UNIX) && !defined(MOZ_WIDGET_PHOTON)
|
||||
dosplash = PR_FALSE;
|
||||
for (i=1; i<argc; i++)
|
||||
if ((PL_strcasecmp(argv[i], "-splash") == 0)
|
||||
|
@ -71,7 +71,7 @@ static NS_DEFINE_CID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID);
|
||||
extern "C" char * strsignal(int);
|
||||
#endif
|
||||
|
||||
#ifdef NTO
|
||||
#ifdef MOZ_WIDGET_PHOTON
|
||||
#include <photon/PhProto.h>
|
||||
#include <sys/mman.h> /* for munlockall() */
|
||||
#endif
|
||||
@ -83,7 +83,7 @@ static char _progname[1024] = "huh?";
|
||||
#define CRAWL_STACK_ON_SIGSEGV
|
||||
#endif
|
||||
|
||||
#ifdef NTO
|
||||
#ifdef MOZ_WIDGET_PHOTON
|
||||
void abnormal_exit_handler(int signum)
|
||||
{
|
||||
/* Free any shared memory that has been allocated */
|
||||
@ -173,7 +173,7 @@ void InstallUnixSignalHandlers(const char *ProgramName)
|
||||
|
||||
PL_strncpy(_progname,ProgramName, (sizeof(_progname)-1) );
|
||||
|
||||
#if defined(NTO)
|
||||
#if defined(MOZ_WIDGET_PHOTON)
|
||||
/* Neutrino need this to free shared memory in case of a crash */
|
||||
signal(SIGTERM, abnormal_exit_handler);
|
||||
signal(SIGQUIT, abnormal_exit_handler);
|
||||
|
Loading…
x
Reference in New Issue
Block a user