Attachment #173982: Removes BeOS code from nsAppRunner and puts it in nsAppSupportBeOS (toolkit and xpfe) for bug #281375

View | Details | Raw Unified | Return to bug 281375 | Differences between
and this patch

Collapse All | Expand All

(-)xpfe/bootstrap/nsNativeAppSupportBeOS.cpp (-72 / +186 lines)
Line     Link Here 
 Lines 21-26    Link Here 
21
 *
21
 *
22
 * Contributor(s):
22
 * Contributor(s):
23
 *   Takashi Toyoshima <toyoshim@be-in.org>
23
 *   Takashi Toyoshima <toyoshim@be-in.org>
24
 *   Fredrik Holmqvist <thesuckiestemail@yahoo.se>
24
 *
25
 *
25
 * Alternatively, the contents of this file may be used under the terms of
26
 * Alternatively, the contents of this file may be used under the terms of
26
 * either of the GNU General Public License Version 2 or later (the "GPL"),
27
 * either of the GNU General Public License Version 2 or later (the "GPL"),
 Lines 42-47    Link Here 
42
#include "nsIObserver.h"
43
#include "nsIObserver.h"
43
44
44
#include <Application.h>
45
#include <Application.h>
46
#include <AppFileInfo.h>
45
#include <Window.h>
47
#include <Window.h>
46
#include <View.h>
48
#include <View.h>
47
#include <StringView.h>
49
#include <StringView.h>
 Lines 54-100    Link Here 
54
#define DEBUG_SPLASH 1
56
#define DEBUG_SPLASH 1
55
#endif
57
#endif
56
58
57
class nsSplashScreenBeOS : public nsISplashScreen,
59
class nsNativeAppSupportBeOS : public nsNativeAppSupportBase,  public nsIObserver
58
                           public nsIObserver {
60
{
59
public:
61
public:
60
	nsSplashScreenBeOS();
62
    nsNativeAppSupportBeOS();
61
	virtual ~nsSplashScreenBeOS();
63
    ~nsNativeAppSupportBeOS();
64
    NS_DECL_ISUPPORTS
65
    NS_DECL_NSINATIVEAPPSUPPORT
66
    NS_DECL_NSIOBSERVER
67
    
68
private:
69
   nsresult LoadBitmap();
70
71
   BWindow *window;
72
   BBitmap *bitmap;
73
   BStringView *textView;
74
}; // nsNativeAppSupportBeOS
62
75
63
	NS_DECL_ISUPPORTS
64
76
65
	NS_IMETHOD Show();
77
class nsBeOSApp : public BApplication
66
	NS_IMETHOD Hide();
78
{
79
public:
80
  nsBeOSApp(sem_id sem) : BApplication( GetAppSig() ), init(sem)
81
  {}
82
  
83
  void ReadyToRun() 
84
  {
85
    release_sem(init);
86
  }
67
87
68
	NS_DECL_NSIOBSERVER
88
  static int32 Main( void *args ) 
89
  {
90
    nsBeOSApp *app = new nsBeOSApp( (sem_id)args );
91
    if( app == NULL )
92
      return B_ERROR;
93
    return app->Run();
94
  }
69
95
70
private:
96
private:
71
	nsresult LoadBitmap();
72
97
73
	BWindow *window;
98
  char *GetAppSig(void) 
74
	BBitmap *bitmap;
99
  {
75
  BStringView *textView;
100
    image_info info;
76
}; // class nsSplashScreenBeOS
101
    int32 cookie = 0;
102
    BFile file;
103
    BAppFileInfo appFileInfo;
104
    static char sig[B_MIME_TYPE_LENGTH];
105
106
    sig[0] = 0;
107
    if (get_next_image_info(0, &cookie, &info) == B_OK &&
108
        file.SetTo(info.name, B_READ_ONLY) == B_OK &&
109
        appFileInfo.SetTo(&file) == B_OK &&
110
        appFileInfo.GetSignature(sig) == B_OK) {
111
      return sig;
112
    }
113
    return "application/x-vnd.Mozilla";
114
  }
77
115
78
nsSplashScreenBeOS::nsSplashScreenBeOS()
116
  sem_id init;
79
		: window( NULL ) , bitmap( NULL ), textView(NULL) {
117
}; //class nsBeOSApp
80
#ifdef DEBUG_SPLASH
118
81
	puts("nsSplashScreenBeOS::nsSlpashScreenBeOS()");
119
// Create and return an instance of class nsNativeAppSupportBeOS.
82
#endif
120
nsresult
121
NS_CreateNativeAppSupport( nsINativeAppSupport **aResult ) 
122
{
123
    if ( !aResult ) {
124
        return NS_ERROR_NULL_POINTER;
125
    }
126
    nsNativeAppSupportBeOS *pNative = new nsNativeAppSupportBeOS();
127
    if ( !pNative ) {
128
        return NS_ERROR_OUT_OF_MEMORY;
129
    }
130
    *aResult = pNative;
131
    NS_ADDREF( *aResult );
132
    return NS_OK;
83
}
133
}
84
134
85
nsSplashScreenBeOS::~nsSplashScreenBeOS() {
135
nsNativeAppSupportBeOS::nsNativeAppSupportBeOS()
86
#ifdef DEBUG_SPLASH
136
	: window( NULL ) , bitmap( NULL ), textView(NULL)
87
	puts("nsSplashScreenBeOS::~nsSlpashScreenBeOS()");
137
{}
88
#endif
138
89
	Hide();
139
nsNativeAppSupportBeOS::~nsNativeAppSupportBeOS()
140
{
141
    if(window != NULL) HideSplashScreen();
142
}
143
144
145
NS_IMPL_ISUPPORTS2(nsNativeAppSupportBeOS, nsINativeAppSupport, nsIObserver)
146
147
NS_IMETHODIMP
148
nsNativeAppSupportBeOS::Start( PRBool *aResult ) 
149
{
150
    NS_ENSURE_ARG( aResult );
151
    NS_ENSURE_TRUE( be_app == NULL, NS_ERROR_NOT_INITIALIZED );
152
153
    sem_id initsem = create_sem(0, "Mozilla BApplication init");
154
    if (initsem < B_OK)
155
      return NS_ERROR_FAILURE;
156
    thread_id tid = spawn_thread(nsBeOSApp::Main, "Mozilla BApplication", B_NORMAL_PRIORITY, (void *)initsem);
157
    * aResult = PR_TRUE;
158
    if (tid < B_OK || B_OK != resume_thread(tid))
159
      * aResult = PR_FALSE;
160
161
    if (B_OK != acquire_sem(initsem))
162
      * aResult = PR_FALSE;
163
    
164
    if (B_OK != delete_sem(initsem))
165
      * aResult = PR_FALSE;
166
    return * aResult == PR_TRUE ? NS_OK : NS_ERROR_FAILURE;
167
}
168
169
NS_IMETHODIMP
170
nsNativeAppSupportBeOS::Stop( PRBool *aResult ) 
171
{
172
    NS_ENSURE_ARG( aResult );
173
    NS_ENSURE_TRUE( be_app, NS_ERROR_NOT_INITIALIZED );
174
175
   *aResult = PR_TRUE;
176
    return NS_OK;
177
}
178
179
NS_IMETHODIMP
180
nsNativeAppSupportBeOS::Quit() 
181
{
182
    return NS_OK;
183
}
184
185
NS_IMETHODIMP
186
nsNativeAppSupportBeOS::EnsureProfile(nsICmdLineService* args)
187
{
188
    return NS_OK;
90
}
189
}
91
190
92
NS_IMPL_ISUPPORTS2(nsSplashScreenBeOS, nsISplashScreen, nsIObserver)
191
NS_IMETHODIMP
192
nsNativeAppSupportBeOS::ReOpen()
193
{
194
  return NS_ERROR_NOT_IMPLEMENTED;
195
}
93
196
94
NS_IMETHODIMP
197
NS_IMETHODIMP
95
nsSplashScreenBeOS::Show() {
198
nsNativeAppSupportBeOS::OnLastWindowClosing()
199
{
200
  return NS_OK;
201
}
202
203
NS_IMETHODIMP
204
nsNativeAppSupportBeOS::GetIsServerMode(PRBool *aIsServerMode) {
205
    *aIsServerMode = PR_FALSE;
206
    return NS_OK;
207
}
208
209
NS_IMETHODIMP
210
nsNativeAppSupportBeOS::SetIsServerMode(PRBool aIsServerMode) {
211
    mServerMode = aIsServerMode;
212
    return NS_ERROR_NOT_IMPLEMENTED;
213
}
214
215
NS_IMETHODIMP
216
nsNativeAppSupportBeOS::StartServerMode() {
217
    return NS_ERROR_NOT_IMPLEMENTED;
218
}
219
220
NS_IMETHODIMP
221
nsNativeAppSupportBeOS::SetShouldShowUI(PRBool aShouldShowUI) {
222
    return NS_ERROR_NOT_IMPLEMENTED;
223
}
224
225
NS_IMETHODIMP
226
nsNativeAppSupportBeOS::GetShouldShowUI(PRBool *aShouldShowUI) {
227
    *aShouldShowUI = PR_TRUE;
228
    return NS_OK;
229
}
230
231
NS_IMETHODIMP
232
nsNativeAppSupportBeOS::ShowSplashScreen() {
96
#ifdef DEBUG_SPLASH
233
#ifdef DEBUG_SPLASH
97
	puts("nsSplashScreenBeOS::Show()");
234
	puts("nsNativeAppSupportBeOS::ShowSplashScreen()");
98
#endif
235
#endif
99
	if (NULL == bitmap && NS_OK != LoadBitmap())
236
	if (NULL == bitmap && NS_OK != LoadBitmap())
100
		return NS_ERROR_FAILURE;
237
		return NS_ERROR_FAILURE;
 Lines 129-137    Link Here 
129
}
266
}
130
267
131
NS_IMETHODIMP
268
NS_IMETHODIMP
132
nsSplashScreenBeOS::Hide() {
269
nsNativeAppSupportBeOS::HideSplashScreen() {
133
#ifdef DEBUG_SPLASH
270
#ifdef DEBUG_SPLASH
134
	puts("nsSplashScreenBeOS::Hide()");
271
	puts("nsNativeAppSupportBeOS::HideSplashScreen()");
135
#endif
272
#endif
136
	if (NULL != window) {
273
	if (NULL != window) {
137
		if (window->Lock())
274
		if (window->Lock())
 Lines 146-187    Link Here 
146
}
283
}
147
284
148
NS_IMETHODIMP
285
NS_IMETHODIMP
149
nsSplashScreenBeOS::Observe(nsISupports *aSubject,
286
nsNativeAppSupportBeOS::Observe(nsISupports *aSubject,
150
                            const char *aTopic,
287
                            const char *aTopic,
151
                            const PRUnichar *someData)
288
                            const PRUnichar *someData)
152
{
289
{
153
  if (!bitmap) return NS_OK;
290
  if (!bitmap) return NS_OK;
154
  nsCAutoString statusString;
291
  nsCAutoString statusString;
155
  statusString.AssignWithConversion(someData);
292
  statusString.AssignWithConversion(someData);
156
  if (textView == NULL) {
293
  if (textView != NULL) {
157
    BRect textRect = bitmap->Bounds();
158
    textView = new BStringView(textRect,
159
                               "splash text",
160
                               statusString.get(), 
161
                               B_FOLLOW_LEFT | B_FOLLOW_V_CENTER);
162
    if (textView) {
163
      // Reduce the view size, and take into account the image frame
164
      textRect.bottom -= 10;
165
      textRect.left += 10;
166
      textRect.right -= 10; 
167
      textRect.top = textRect.bottom - 20;
168
169
      textView->SetViewColor(B_TRANSPARENT_COLOR);
170
      textView->SetHighColor(255,255,255,0);
171
      textView->SetLowColor(0,0,0,0);
172
      window->AddChild(textView);
173
    }
174
  } else {
175
    if (textView->LockLooper()) {
294
    if (textView->LockLooper()) {
176
      textView->SetText(statusString.get());
295
      textView->SetText(statusString.get());
177
      textView->UnlockLooper();
296
      textView->UnlockLooper();
178
    }
297
    }
298
    return NS_OK;
179
  }
299
  }
300
  BRect textRect = bitmap->Bounds();
301
  textView = new BStringView(textRect,
302
                             "splash text",
303
                             statusString.get(), 
304
                             B_FOLLOW_LEFT | B_FOLLOW_V_CENTER);
305
306
  if (!textView) return NS_OK;
307
    
308
  // Reduce the view size, and take into account the image frame
309
  textRect.bottom -= 10;
310
  textRect.left += 10;
311
  textRect.right -= 10; 
312
  textRect.top = textRect.bottom - 20;
313
  textView->SetViewColor(B_TRANSPARENT_COLOR);
314
  textView->SetHighColor(255,255,255,0);
315
  textView->SetLowColor(0,0,0,0);
316
  window->AddChild(textView);
180
  return NS_OK;
317
  return NS_OK;
181
}
318
}
182
319
183
nsresult
320
nsresult
184
nsSplashScreenBeOS::LoadBitmap() {
321
nsNativeAppSupportBeOS::LoadBitmap() {
185
	BResources *rsrc = be_app->AppResources();
322
	BResources *rsrc = be_app->AppResources();
186
	if (NULL == rsrc)
323
	if (NULL == rsrc)
187
		return NS_ERROR_FAILURE;
324
		return NS_ERROR_FAILURE;
 Lines 203-228    Link Here 
203
	return NS_OK;
340
	return NS_OK;
204
}
341
}
205
342
206
207
// Create instance of BeOS splash screen object.
208
nsresult
209
NS_CreateSplashScreen( nsISplashScreen **aResult ) {
210
	if ( aResult ) {
211
		*aResult = new nsSplashScreenBeOS;
212
		if ( *aResult ) {
213
			NS_ADDREF( *aResult );
214
			return NS_OK;
215
		} else {
216
			return NS_ERROR_OUT_OF_MEMORY;
217
		}
218
	} else {
219
		return NS_ERROR_NULL_POINTER;
220
	}
221
}
222
223
224
PRBool NS_CanRun()
225
{
226
	return PR_TRUE;
227
}
228
(-)xpfe/bootstrap/nsAppRunner.cpp (-79 / +3 lines)
Line     Link Here 
 Lines 21-26    Link Here 
21
 *
21
 *
22
 * Contributor(s):
22
 * Contributor(s):
23
 *   Roland Mainz <roland.mainz@informatik.med.uni-giessen.de>
23
 *   Roland Mainz <roland.mainz@informatik.med.uni-giessen.de>
24
 *   Fredrik Holmqvist <thesuckiestemail@yahoo.se>
24
 *
25
 *
25
 * Alternatively, the contents of this file may be used under the terms of
26
 * Alternatively, the contents of this file may be used under the terms of
26
 * either of the GNU General Public License Version 2 or later (the "GPL"),
27
 * either of the GNU General Public License Version 2 or later (the "GPL"),
 Lines 246-323    Link Here 
246
int   __argc;
247
int   __argc;
247
#endif /* XP_OS2 */
248
#endif /* XP_OS2 */
248
249
249
#if defined(XP_BEOS)
250
251
#include <AppKit.h>
252
#include <AppFileInfo.h>
253
254
class nsBeOSApp : public BApplication
255
{
256
public:
257
  nsBeOSApp(sem_id sem)
258
  : BApplication(GetAppSig()), init(sem)
259
  {
260
  }
261
262
  void ReadyToRun(void)
263
  {
264
    release_sem(init);
265
  }
266
267
  static int32 Main(void *args)
268
  {
269
    nsBeOSApp *app = new nsBeOSApp((sem_id)args);
270
    if (nsnull == app)
271
      return B_ERROR;
272
    return app->Run();
273
  }
274
275
private:
276
  char *GetAppSig(void)
277
  {
278
    app_info appInfo;
279
    BFile file;
280
    BAppFileInfo appFileInfo;
281
    image_info info;
282
    int32 cookie = 0;
283
    static char sig[B_MIME_TYPE_LENGTH];
284
285
    sig[0] = 0;
286
    if (get_next_image_info(0, &cookie, &info) != B_OK ||
287
        file.SetTo(info.name, B_READ_ONLY) != B_OK ||
288
        appFileInfo.SetTo(&file) != B_OK ||
289
        appFileInfo.GetSignature(sig) != B_OK)
290
    {
291
      return "application/x-vnd.Mozilla";
292
    }
293
    return sig;
294
  }
295
296
  sem_id init;
297
};
298
299
static nsresult InitializeBeOSApp(void)
300
{
301
  nsresult rv = NS_OK;
302
303
  sem_id initsem = create_sem(0, "beapp init");
304
  if (initsem < B_OK)
305
    return NS_ERROR_FAILURE;
306
307
  thread_id tid = spawn_thread(nsBeOSApp::Main, "BApplication", B_NORMAL_PRIORITY, (void *)initsem);
308
  if (tid < B_OK || B_OK != resume_thread(tid))
309
    rv = NS_ERROR_FAILURE;
310
311
  if (B_OK != acquire_sem(initsem))
312
    rv = NS_ERROR_FAILURE;
313
  if (B_OK != delete_sem(initsem))
314
    rv = NS_ERROR_FAILURE;
315
316
  return rv;
317
}
318
319
#endif // XP_BEOS
320
321
#if defined(XP_MAC)
250
#if defined(XP_MAC)
322
251
323
#include "macstdlibextras.h"
252
#include "macstdlibextras.h"
 Lines 386-392    Link Here 
386
/*********************************************/
315
/*********************************************/
387
// Default implemenations for nativeAppSupport
316
// Default implemenations for nativeAppSupport
388
// If your platform implements these functions if def out this code.
317
// If your platform implements these functions if def out this code.
389
#if !defined(MOZ_WIDGET_COCOA) && !defined(MOZ_WIDGET_PHOTON) && !defined( XP_WIN) && !defined(XP_OS2) && !defined( XP_BEOS ) && !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_GTK2)
318
#if !defined(MOZ_WIDGET_COCOA) && !defined(MOZ_WIDGET_PHOTON) && !defined( XP_WIN) && !defined(XP_OS2) && !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_GTK2)
390
319
391
nsresult NS_CreateSplashScreen(nsISplashScreen **aResult)
320
nsresult NS_CreateSplashScreen(nsISplashScreen **aResult)
392
{
321
{
 Lines 421-427    Link Here 
421
//       nsISplashScreen will be removed.
350
//       nsISplashScreen will be removed.
422
//
351
//
423
352
424
#if !defined(XP_WIN) && !defined(XP_OS2) && !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_GTK2) && !defined(XP_MAC) && (!defined(XP_MACOSX) || defined(MOZ_WIDGET_COCOA))
353
#if !defined(XP_WIN) && !defined(XP_OS2)&& !defined( XP_BEOS ) && !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_GTK2) && !defined(XP_MAC) && (!defined(XP_MACOSX) || defined(MOZ_WIDGET_COCOA))
425
354
426
nsresult NS_CreateNativeAppSupport(nsINativeAppSupport **aResult)
355
nsresult NS_CreateNativeAppSupport(nsINativeAppSupport **aResult)
427
{
356
{
 Lines 1647-1657    Link Here 
1647
  PR_OS2_SetFloatExcpHandler(&excpreg);
1576
  PR_OS2_SetFloatExcpHandler(&excpreg);
1648
#endif /* XP_OS2 */
1577
#endif /* XP_OS2 */
1649
1578
1650
#if defined(XP_BEOS)
1651
  if (NS_OK != InitializeBeOSApp())
1652
    return 1;
1653
#endif
1654
1655
#if defined(XP_MACOSX)
1579
#if defined(XP_MACOSX)
1656
  InitializeMacOSXApp(argc, argv);
1580
  InitializeMacOSXApp(argc, argv);
1657
#endif
1581
#endif
(-)toolkit/xre/nsAppRunner.cpp (-77 / +9 lines)
Line     Link Here 
 Lines 23-28    Link Here 
23
 *   Roland Mainz <roland.mainz@informatik.med.uni-giessen.de>
23
 *   Roland Mainz <roland.mainz@informatik.med.uni-giessen.de>
24
 *   Benjamin Smedberg <bsmedberg@covad.net>
24
 *   Benjamin Smedberg <bsmedberg@covad.net>
25
 *   Ben Goodger <ben@mozilla.org>
25
 *   Ben Goodger <ben@mozilla.org>
26
 *   Fredrik Holmqvist <thesuckiestemail@yahoo.se>
26
 *
27
 *
27
 * Alternatively, the contents of this file may be used under the terms of
28
 * Alternatively, the contents of this file may be used under the terms of
28
 * either the GNU General Public License Version 2 or later (the "GPL"), or
29
 * either the GNU General Public License Version 2 or later (the "GPL"), or
 Lines 109-114    Link Here 
109
#include <unistd.h>
110
#include <unistd.h>
110
#endif
111
#endif
111
112
113
#ifdef XP_BEOS
114
//BeOS has execve in unistd, but it doesn't work well enough.
115
//It leaves zombies around until the app that launched Firefox is closed.
116
//#include <unistd.h>
117
#include <AppKit.h>
118
#include <AppFileInfo.h>
119
#endif //XP_BEOS
120
112
#ifdef XP_WIN
121
#ifdef XP_WIN
113
#include <windows.h>
122
#include <windows.h>
114
#include <process.h>
123
#include <process.h>
 Lines 227-304    Link Here 
227
static int    gRestartArgc;
236
static int    gRestartArgc;
228
static char **gRestartArgv;
237
static char **gRestartArgv;
229
238
230
#if defined(XP_BEOS)
231
232
#include <AppKit.h>
233
#include <AppFileInfo.h>
234
235
class nsBeOSApp : public BApplication
236
{
237
public:
238
  nsBeOSApp(sem_id sem)
239
  : BApplication(GetAppSig()), init(sem)
240
  {
241
  }
242
243
  void ReadyToRun(void)
244
  {
245
    release_sem(init);
246
  }
247
248
  static int32 Main(void *args)
249
  {
250
    nsBeOSApp *app = new nsBeOSApp((sem_id)args);
251
    if (nsnull == app)
252
      return B_ERROR;
253
    return app->Run();
254
  }
255
256
private:
257
  char *GetAppSig(void)
258
  {
259
    app_info appInfo;
260
    BFile file;
261
    BAppFileInfo appFileInfo;
262
    image_info info;
263
    int32 cookie = 0;
264
    static char sig[B_MIME_TYPE_LENGTH];
265
266
    sig[0] = 0;
267
    if (get_next_image_info(0, &cookie, &info) != B_OK ||
268
        file.SetTo(info.name, B_READ_ONLY) != B_OK ||
269
        appFileInfo.SetTo(&file) != B_OK ||
270
        appFileInfo.GetSignature(sig) != B_OK)
271
    {
272
      return "application/x-vnd.Mozilla";
273
    }
274
    return sig;
275
  }
276
277
  sem_id init;
278
};
279
280
static nsresult InitializeBeOSApp(void)
281
{
282
  nsresult rv = NS_OK;
283
284
  sem_id initsem = create_sem(0, "beapp init");
285
  if (initsem < B_OK)
286
    return NS_ERROR_FAILURE;
287
288
  thread_id tid = spawn_thread(nsBeOSApp::Main, "BApplication", B_NORMAL_PRIORITY, (void *)initsem);
289
  if (tid < B_OK || B_OK != resume_thread(tid))
290
    rv = NS_ERROR_FAILURE;
291
292
  if (B_OK != acquire_sem(initsem))
293
    rv = NS_ERROR_FAILURE;
294
  if (B_OK != delete_sem(initsem))
295
    rv = NS_ERROR_FAILURE;
296
297
  return rv;
298
}
299
300
#endif // XP_BEOS
301
302
#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
239
#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
303
#include <gtk/gtk.h>
240
#include <gtk/gtk.h>
304
#endif //MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2
241
#endif //MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2
 Lines 1512-1522    Link Here 
1512
  ScopedFPHandler handler();
1449
  ScopedFPHandler handler();
1513
#endif /* XP_OS2 */
1450
#endif /* XP_OS2 */
1514
1451
1515
#if defined(XP_BEOS)
1516
  if (NS_OK != InitializeBeOSApp())
1517
    return 1;
1518
#endif
1519
1520
#ifdef _BUILD_STATIC_BIN
1452
#ifdef _BUILD_STATIC_BIN
1521
  // Initialize XPCOM's module info table
1453
  // Initialize XPCOM's module info table
1522
  NSGetStaticModuleInfo = app_getModuleInfo;
1454
  NSGetStaticModuleInfo = app_getModuleInfo;
(-)toolkit/xre/Makefile.in (+4 lines)
Line     Link Here 
 Lines 113-122    Link Here 
113
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
113
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
114
CPPSRCS += nsNativeAppSupportOS2.cpp
114
CPPSRCS += nsNativeAppSupportOS2.cpp
115
else
115
else
116
ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
117
CPPSRCS += nsNativeAppSupportBeOS.cpp
118
else
116
CPPSRCS += nsNativeAppSupportDefault.cpp
119
CPPSRCS += nsNativeAppSupportDefault.cpp
117
endif
120
endif
118
endif
121
endif
119
endif
122
endif
123
endif
120
124
121
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
125
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
122
CMSRCS = MacLaunchHelper.m
126
CMSRCS = MacLaunchHelper.m

Return to bug 281375
Privacy Policy