зеркало из https://github.com/mozilla/pjs.git
Bug 125411 [NuBus] Mac installer crashes with a type 12 error (SleepQInstall)
r=sfraser sr=beard thanks to tim@maroney.org (see bug 138156)
This commit is contained in:
Родитель
ae2bbe419e
Коммит
8e11200b25
|
@ -66,6 +66,9 @@
|
|||
#include <UTCUtils.h>
|
||||
#include <Power.h>
|
||||
#include <CodeFragments.h>
|
||||
#ifndef TARGET_CARBON
|
||||
#include <Traps.h>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(XP_UNIX) || defined(XP_BEOS)
|
||||
|
@ -154,7 +157,11 @@ static void MyReadLocation(MachineLocation * loc)
|
|||
MacintoshInitializeTime();
|
||||
ReadLocation(&storedLoc);
|
||||
/* install a sleep queue routine, so that when the machine wakes up, time can be recomputed. */
|
||||
if (&SleepQInstall != (void*)kUnresolvedCFragSymbolAddress) {
|
||||
if (&SleepQInstall != (void*)kUnresolvedCFragSymbolAddress
|
||||
#ifndef TARGET_CARBON
|
||||
&& NGetTrapAddress(0xA28A, OSTrap) != NGetTrapAddress(_Unimplemented, ToolTrap)
|
||||
#endif
|
||||
) {
|
||||
if ((gSleepQEntry.sleepQProc = NewSleepQUPP(MySleepQProc)) != NULL) {
|
||||
SleepQInstall(&gSleepQEntry);
|
||||
gSleepQEntryInstalled = JS_TRUE;
|
||||
|
|
Загрузка…
Ссылка в новой задаче