amizilla-cvs Mailing List for AmiZilla
Brought to you by:
maxlarsson
You can subscribe to this list here.
2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(41) |
Jul
(50) |
Aug
(3) |
Sep
(3) |
Oct
(106) |
Nov
(9) |
Dec
(9) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Oliver B. <o1...@us...> - 2005-05-24 09:15:45
|
Update of /cvsroot/amizilla/amizilla/netwerk/cache/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24688 Modified Files: Makefile.in Log Message: Sorry, had to undo the previous commit. Remember, always do a make clean and test your stuff, befor you commit.. Index: Makefile.in =================================================================== RCS file: /cvsroot/amizilla/amizilla/netwerk/cache/src/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.in 24 May 2005 07:35:42 -0000 1.2 --- Makefile.in 24 May 2005 09:15:22 -0000 1.3 *************** *** 40,48 **** $(NULL) - # AmigaOS special ftruncate - ifneq (,$(filter AmigaOS,$(OS_ARCH))) - CSRCS = ../../base/src/amigaSetFileSize.c - endif - CPPSRCS = \ nsCache.cpp \ --- 40,43 ---- |
From: Oliver B. <o1...@us...> - 2005-05-24 07:37:40
|
Update of /cvsroot/amizilla/amizilla/netwerk/base/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7116 Modified Files: Makefile.in Log Message: Added amigaSetFileSize. Index: Makefile.in =================================================================== RCS file: /cvsroot/amizilla/amizilla/netwerk/base/src/Makefile.in,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -d -r1.1.1.2 -r1.2 *** Makefile.in 29 Jun 2004 11:07:10 -0000 1.1.1.2 --- Makefile.in 24 May 2005 07:37:31 -0000 1.2 *************** *** 37,40 **** --- 37,46 ---- $(NULL) + + # AmigaOS special ftruncate + ifneq (,$(filter AmigaOS,$(OS_ARCH))) + CSRCS = amigaSetFileSize.c + endif + CPPSRCS = \ nsIOThreadPool.cpp \ |
From: Oliver B. <o1...@us...> - 2005-05-24 07:35:53
|
Update of /cvsroot/amizilla/amizilla/netwerk/cache/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6843 Modified Files: Makefile.in Log Message: added amigaSetFileSize Index: Makefile.in =================================================================== RCS file: /cvsroot/amizilla/amizilla/netwerk/cache/src/Makefile.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile.in 22 Jun 2003 11:55:08 -0000 1.1.1.1 --- Makefile.in 24 May 2005 07:35:42 -0000 1.2 *************** *** 40,43 **** --- 40,48 ---- $(NULL) + # AmigaOS special ftruncate + ifneq (,$(filter AmigaOS,$(OS_ARCH))) + CSRCS = ../../base/src/amigaSetFileSize.c + endif + CPPSRCS = \ nsCache.cpp \ |
From: Oliver B. <o1...@us...> - 2005-05-24 07:30:17
|
Update of /cvsroot/amizilla/amizilla/netwerk/base/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5739 Modified Files: nsFileStreams.cpp Added Files: amigaSetFileSize.c amigaSetFileSize.h Log Message: Can't use dos includes in the Mozilla cpp sources, as stuff like ACCESS_WRITE collides with Mozilla includes. Maybe move this to the AmigaOS part of nspr later. --- NEW FILE: amigaSetFileSize.h --- /* ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * * The contents of this file are subject to the Mozilla Public License Version * 1.1 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * http://www.mozilla.org/MPL/ * * Software distributed under the License is distributed on an "AS IS" basis, * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License * for the specific language governing rights and limitations under the * License. * * The Original Code is Mozilla. * * The Initial Developer of the Original Code is * Netscape Communications Corporation. * Portions created by the Initial Developer are Copyright (C) 2002 * the Initial Developer. All Rights Reserved. * * Contributor(s): * Oliver Brunner <ami...@ol...> * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), * in which case the provisions of the GPL or the LGPL are applicable instead * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to * use your version of this file under the terms of the MPL, indicate your * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ /* AmigaDos includes conflict with Mozilla includes at various places. * This stuff should better go to nspr in the Mozilla sources. * This more a hack than a clean solution ;). */ #if defined(XP_AMIGAOS) extern "C" { int AmigaSetFileSize( int fh, int pos); } #endif --- NEW FILE: amigaSetFileSize.c --- /* ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * * The contents of this file are subject to the Mozilla Public License Version * 1.1 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * http://www.mozilla.org/MPL/ * * Software distributed under the License is distributed on an "AS IS" basis, * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License * for the specific language governing rights and limitations under the * License. * * The Original Code is Mozilla. * * The Initial Developer of the Original Code is * Netscape Communications Corporation. * Portions created by the Initial Developer are Copyright (C) 2002 * the Initial Developer. All Rights Reserved. * * Contributor(s): * Oliver Brunner <ami...@ol...> * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), * in which case the provisions of the GPL or the LGPL are applicable instead * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to * use your version of this file under the terms of the MPL, indicate your * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ /* AmigaDos includes conflict with Mozilla includes at various places. * This stuff should better go to nspr in the Mozilla sources. * This more a hack than a clean solution ;). */ #if defined(XP_AMIGAOS) #include <proto/dos.h> #include <dos/dos.h> int AmigaSetFileSize(int fh,int length) { return ((int) SetFileSize((BPTR) fh, (LONG) length, OFFSET_BEGINNING) == -1 ); } #endif Index: nsFileStreams.cpp =================================================================== RCS file: /cvsroot/amizilla/amizilla/netwerk/base/src/nsFileStreams.cpp,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -d -r1.1.1.2 -r1.2 *** nsFileStreams.cpp 29 Jun 2004 11:07:09 -0000 1.1.1.2 --- nsFileStreams.cpp 24 May 2005 07:30:07 -0000 1.2 *************** *** 36,40 **** * ***** END LICENSE BLOCK ***** */ ! #if defined(XP_UNIX) || defined(XP_BEOS) #include <unistd.h> #elif defined(XP_MAC) --- 36,40 ---- * ***** END LICENSE BLOCK ***** */ ! #if (defined(XP_UNIX) || defined(XP_BEOS)) && !(defined XP_AMIGAOS) #include <unistd.h> #elif defined(XP_MAC) *************** *** 45,48 **** --- 45,50 ---- #define INCL_DOSERRORS #include <os2.h> + #elif defined (XP_AMIGAOS) + #include "amigaSetFileSize.h" #else // XXX add necessary include file for ftruncate (or equivalent) *************** *** 169,173 **** #endif ! #if defined(XP_UNIX) || defined(XP_BEOS) if (ftruncate(PR_FileDesc2NativeHandle(mFD), offset) != 0) { NS_ERROR("ftruncate failed"); --- 171,175 ---- #endif ! #if (defined(XP_UNIX) || defined(XP_BEOS)) && !(defined XP_AMIGAOS) if (ftruncate(PR_FileDesc2NativeHandle(mFD), offset) != 0) { NS_ERROR("ftruncate failed"); *************** *** 189,192 **** --- 191,199 ---- return NS_ERROR_FAILURE; } + #elif defined(XP_AMIGAOS) + if (AmigaSetFileSize(PR_FileDesc2NativeHandle(mFD),offset) == -1 ) { + NS_ERROR("AmigaSetFileSize failed"); + return NS_ERROR_FAILURE; + } #else // XXX not implemented |
From: Oliver B. <o1...@us...> - 2005-05-24 07:20:57
|
Update of /cvsroot/amizilla/amizilla/xpcom/base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4075 Modified Files: nsDebugImpl.cpp Log Message: Added case for AmigaOS abort handling. Faked screenshot of this commit will follow later ;). Index: nsDebugImpl.cpp =================================================================== RCS file: /cvsroot/amizilla/amizilla/xpcom/base/nsDebugImpl.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** nsDebugImpl.cpp 11 Oct 2004 21:04:28 -0000 1.2 --- nsDebugImpl.cpp 24 May 2005 07:20:47 -0000 1.3 *************** *** 287,291 **** fflush(stderr); ! #if defined(_WIN32) #ifdef _M_IX86 ::DebugBreak(); --- 287,295 ---- fflush(stderr); ! #if defined(XP_AMIGAOS) ! // Maybe add something more usefull here later. ! Abort(aFile, aLine); ! ! #elif defined(_WIN32) #ifdef _M_IX86 ::DebugBreak(); |
From: Jeff S. <jsh...@us...> - 2005-05-23 17:53:26
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7852/src/md/amiga Modified Files: avar.c alock.c Log Message: Renamed the function prototypes for the DCE functions to match. In PRP_TryLock don't relock if I already have the lock. Just return failure. Index: alock.c =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga/alock.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** alock.c 29 Dec 2004 00:07:03 -0000 1.5 --- alock.c 23 May 2005 17:53:04 -0000 1.6 *************** *** 121,129 **** PRThread *me = PR_GetCurrentThread(); PRStatus rv = PR_SUCCESS; Forbid(); ! if (lock->owner != NULL) { rv = PR_FAILURE; } - PR_Lock(lock); end: Permit(); --- 121,138 ---- PRThread *me = PR_GetCurrentThread(); PRStatus rv = PR_SUCCESS; + + #ifdef DEBUG_ALOCK + printf("%lx, PRP_TryLock for %x, owner is %lx\n", me, lock, lock->owner); + #endif + Forbid(); ! if (lock->owner == me) { rv = PR_FAILURE; + } else { + if (lock->owner != NULL) { + rv = PR_FAILURE; + } + PR_Lock(lock); } end: Permit(); Index: avar.c =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga/avar.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** avar.c 29 Dec 2004 00:13:17 -0000 1.7 --- avar.c 23 May 2005 17:53:04 -0000 1.8 *************** *** 107,111 **** PR_IMPLEMENT(PRStatus) PRP_NakedWait(PRCondVar *cvar, PRLock *lock, PRIntervalTime timeout) { PRThread *me = PR_GetCurrentThread(); ! PRStatus slp = PR_SUCCESS; PRInt32 priority = PR_GetThreadPriority(me); --- 107,111 ---- PR_IMPLEMENT(PRStatus) PRP_NakedWait(PRCondVar *cvar, PRLock *lock, PRIntervalTime timeout) { PRThread *me = PR_GetCurrentThread(); ! _PR_MD_Timeout slp = SUCCESS; PRInt32 priority = PR_GetThreadPriority(me); *************** *** 142,150 **** if (timeout == PR_INTERVAL_NO_WAIT) { ! slp = PR_Sleep(0); } else if (timeout == PR_INTERVAL_NO_TIMEOUT) { _PR_MD_Wait(me, PR_TRUE, PR_TRUE); } else { ! slp = PR_Sleep(timeout); } me->state = _PR_RUNNING; --- 142,150 ---- if (timeout == PR_INTERVAL_NO_WAIT) { ! slp = _PR_MD_Sleep(0); } else if (timeout == PR_INTERVAL_NO_TIMEOUT) { _PR_MD_Wait(me, PR_TRUE, PR_TRUE); } else { ! slp = _PR_MD_Sleep(timeout); } me->state = _PR_RUNNING; *************** *** 160,168 **** PR_Lock(lock); ! if (slp != PR_SUCCESS) { #ifdef DEBUG_AVAR printf("%lx, sleep failed, returning\n", me); #endif ! return slp; } --- 160,170 ---- PR_Lock(lock); ! if (slp == TIMEDOUT) { ! PR_SetError(PR_IO_TIMEOUT_ERROR, 0); ! } else if (slp != SUCCESS) { #ifdef DEBUG_AVAR printf("%lx, sleep failed, returning\n", me); #endif ! return PR_FAILURE; } *************** *** 261,265 **** } ! PR_IMPLEMENT(PRCondVar *) PR_NewNakedCondVar(void) { PRCondVar *retval; --- 263,267 ---- } ! PR_IMPLEMENT(PRCondVar *) PRP_NewNakedCondVar(void) { PRCondVar *retval; *************** *** 274,278 **** } ! PR_IMPLEMENT(void) PR_DestroyNakedCondVar(PRCondVar *cvar) { return PR_Free(cvar); } --- 276,280 ---- } ! PR_IMPLEMENT(void) PRP_DestroyNakedCondVar(PRCondVar *cvar) { return PR_Free(cvar); } |
From: Jeff S. <jsh...@us...> - 2004-12-29 00:18:39
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/src/linking In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10146 Modified Files: prlink.c Log Message: Fix warning. Index: prlink.c =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/pr/src/linking/prlink.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** prlink.c 11 Oct 2004 18:57:48 -0000 1.3 --- prlink.c 29 Dec 2004 00:18:30 -0000 1.4 *************** *** 1191,1195 **** if (lm->dlh == NULL || lm->dlh->ix_Cookie != 0x4a535300) { if (lm->dlh) { ! CloseLibrary(lm->dlh); } PR_DELETE(lm); --- 1191,1195 ---- if (lm->dlh == NULL || lm->dlh->ix_Cookie != 0x4a535300) { if (lm->dlh) { ! CloseLibrary((struct Library *)lm->dlh); } PR_DELETE(lm); *************** *** 1582,1585 **** --- 1582,1586 ---- #ifdef XP_AMIGAOS + f = DLD_GetSymbol((struct Library *)lm->dlh,name); if (f == NULL) { |
From: Jeff S. <jsh...@us...> - 2004-12-29 00:18:11
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/include/private In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10025/pr/include/private Modified Files: primpl.h Log Message: Don't need primordial thread pointer anymore. a4.library takes care of it. Index: primpl.h =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/pr/include/private/primpl.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** primpl.h 11 Oct 2004 18:35:27 -0000 1.13 --- primpl.h 29 Dec 2004 00:18:01 -0000 1.14 *************** *** 1587,1596 **** struct PRThread { - #ifdef _PR_ATHREADS - /* I put this here first so I can get access directly - * to a Amiga-Native object without all of this extra stuff - */ - struct Process *primordialThread; - #endif volatile PRUint32 state; /* thread's creation state */ PRThreadPriority priority; /* apparent priority, loosly defined */ --- 1587,1590 ---- |
From: Jeff S. <jsh...@us...> - 2004-12-29 00:17:18
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/include/md In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9851/pr/include/md Modified Files: _amigaos_threads.h Log Message: Updated prototype for _PR_MD_Wait Index: _amigaos_threads.h =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/pr/include/md/_amigaos_threads.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** _amigaos_threads.h 29 Jun 2004 03:19:49 -0000 1.8 --- _amigaos_threads.h 29 Dec 2004 00:17:08 -0000 1.9 *************** *** 52,56 **** #define _MD_CURRENT_THREAD PR_GetCurrentThread ! void _PR_MD_Wait(PRThread *thread, PRBool interruptable); void _PR_MD_Signal(PRThread *thread); --- 52,56 ---- #define _MD_CURRENT_THREAD PR_GetCurrentThread ! void _PR_MD_Wait(PRThread *thread, PRBool interruptable, PRBool clearSignal); void _PR_MD_Signal(PRThread *thread); |
From: Jeff S. <jsh...@us...> - 2004-12-29 00:15:13
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/include/md In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9436 Modified Files: _amigaos.h Log Message: _PR_Sleep -> _PR_MD_Sleep to be consistent. Index: _amigaos.h =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/pr/include/md/_amigaos.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** _amigaos.h 11 Oct 2004 18:34:11 -0000 1.17 --- _amigaos.h 29 Dec 2004 00:15:02 -0000 1.18 *************** *** 44,48 **** typedef enum { FAILURE = -1, SUCCESS = 0, TIMEDOUT = 1, INTERRUPTED = 2} _PR_MD_Timeout; ! _PR_MD_Timeout _PR_Sleep(PRIntervalTime); struct _MDFileMap { --- 44,48 ---- typedef enum { FAILURE = -1, SUCCESS = 0, TIMEDOUT = 1, INTERRUPTED = 2} _PR_MD_Timeout; ! _PR_MD_Timeout _PR_MD_Sleep(PRIntervalTime); struct _MDFileMap { |
From: Jeff S. <jsh...@us...> - 2004-12-29 00:13:27
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9023 Modified Files: avar.c Log Message: Implemented PRP functions. Index: avar.c =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga/avar.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** avar.c 11 Oct 2004 18:38:56 -0000 1.6 --- avar.c 29 Dec 2004 00:13:17 -0000 1.7 *************** *** 34,40 **** #include "primpl.h" /* Debug condition variables */ ! /* #define DEBUG_AVAR */ /* --- 34,41 ---- #include "primpl.h" + #include "prpdce.h" /* Debug condition variables */ ! /*#define DEBUG_AVAR*/ /* *************** *** 101,108 **** */ PR_IMPLEMENT(PRStatus) PR_WaitCondVar(PRCondVar *cvar, PRIntervalTime timeout) { PRThread *me = PR_GetCurrentThread(); PRStatus slp = PR_SUCCESS; PRInt32 priority = PR_GetThreadPriority(me); ! PR_ASSERT(cvar->lock->owner == me); if (_PR_PENDING_INTERRUPT(me)) { #ifdef DEBUG_AVAR --- 102,118 ---- */ PR_IMPLEMENT(PRStatus) PR_WaitCondVar(PRCondVar *cvar, PRIntervalTime timeout) { + return PRP_NakedWait(cvar, cvar->lock, timeout); + } + + PR_IMPLEMENT(PRStatus) PRP_NakedWait(PRCondVar *cvar, PRLock *lock, PRIntervalTime timeout) { PRThread *me = PR_GetCurrentThread(); PRStatus slp = PR_SUCCESS; PRInt32 priority = PR_GetThreadPriority(me); ! ! if (lock == _PR_NAKED_CV_LOCK) { ! return PR_FAILURE; ! } ! ! PR_ASSERT(lock->owner == me); if (_PR_PENDING_INTERRUPT(me)) { #ifdef DEBUG_AVAR *************** *** 115,119 **** #ifdef DEBUG_AVAR ! printf("(%lx) For cvar %lx, lock owner is %lx, timeout is %d\n", me, cvar, cvar->lock->owner, timeout); #endif --- 125,129 ---- #ifdef DEBUG_AVAR ! printf("(%lx) For cvar %lx, lock owner is %lx, timeout is %d\n", me, cvar, lock->owner, timeout); #endif *************** *** 129,138 **** PR_APPEND_LINK(&me->waitQLinks, &(cvar->condQ)); ! PR_Unlock(cvar->lock); if (timeout == PR_INTERVAL_NO_WAIT) { slp = PR_Sleep(0); } else if (timeout == PR_INTERVAL_NO_TIMEOUT) { ! _PR_MD_Wait(me, PR_TRUE); } else { slp = PR_Sleep(timeout); --- 139,148 ---- PR_APPEND_LINK(&me->waitQLinks, &(cvar->condQ)); ! PR_Unlock(lock); if (timeout == PR_INTERVAL_NO_WAIT) { slp = PR_Sleep(0); } else if (timeout == PR_INTERVAL_NO_TIMEOUT) { ! _PR_MD_Wait(me, PR_TRUE, PR_TRUE); } else { slp = PR_Sleep(timeout); *************** *** 148,152 **** #endif ! PR_Lock(cvar->lock); if (slp != PR_SUCCESS) { --- 158,162 ---- #endif ! PR_Lock(lock); if (slp != PR_SUCCESS) { *************** *** 158,162 **** #ifdef DEBUG_AVAR ! printf("%lx got cvar lock %lx, owner is now %lx, cvar is %lx, flags are %lx\n", me, cvar->lock, cvar->lock->owner, cvar, me->flags); #endif --- 168,172 ---- #ifdef DEBUG_AVAR ! printf("%lx got cvar lock %lx, owner is now %lx, cvar is %lx, flags are %lx\n", me, lock, lock->owner, cvar, me->flags); #endif *************** *** 191,195 **** printf("%lx going to notify thread of cond var %lx, lock %lx, owner is %lx\n", me, cvar, cvar->lock, cvar->lock->owner); #endif ! PR_ASSERT(cvar->lock->owner == me); if (!PR_CLIST_IS_EMPTY(&(cvar->condQ))) { --- 201,205 ---- printf("%lx going to notify thread of cond var %lx, lock %lx, owner is %lx\n", me, cvar, cvar->lock, cvar->lock->owner); #endif ! PR_ASSERT(cvar->lock == _PR_NAKED_CV_LOCK || cvar->lock->owner == me); if (!PR_CLIST_IS_EMPTY(&(cvar->condQ))) { *************** *** 227,231 **** #endif ! PR_ASSERT(cvar->lock->owner == me); if (!PR_CLIST_IS_EMPTY(&(cvar->condQ))) { --- 237,241 ---- #endif ! PR_ASSERT(cvar->lock == _PR_NAKED_CV_LOCK || cvar->lock->owner == me); if (!PR_CLIST_IS_EMPTY(&(cvar->condQ))) { *************** *** 250,251 **** --- 260,294 ---- return PR_SUCCESS; } + + PR_IMPLEMENT(PRCondVar *) PR_NewNakedCondVar(void) { + PRCondVar *retval; + + if (!_pr_initialized) _PR_ImplicitInitialization(); + + retval = PR_NEWZAP(PRCondVar); + if (retval) { + retval->lock = _PR_NAKED_CV_LOCK; + PR_INIT_CLIST(&retval->condQ); + } + return retval; + } + + PR_IMPLEMENT(void) PR_DestroyNakedCondVar(PRCondVar *cvar) { + return PR_Free(cvar); + } + + PR_IMPLEMENT(PRStatus) PRP_NakedNotify(PRCondVar *cvar) { + if (cvar->lock != _PR_NAKED_CV_LOCK) { + return PR_FAILURE; + } else { + return PR_NotifyCondVar(cvar); + } + } + + PR_IMPLEMENT(PRStatus) PRP_NakedBroadcast(PRCondVar *cvar) { + if (cvar->lock != _PR_NAKED_CV_LOCK) { + return PR_FAILURE; + } else { + return PR_NotifyAllCondVar(cvar); + } + } |
From: Jeff S. <jsh...@us...> - 2004-12-29 00:13:02
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8560 Modified Files: atime.c Log Message: _PR_Sleep -> _PR_MD_Sleep to be consistent. Updated PR_MD_Wait calls. Always WaitIO(). Fixed PR_Now(). Index: atime.c =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga/atime.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** atime.c 14 Oct 2004 22:50:15 -0000 1.9 --- atime.c 29 Dec 2004 00:12:51 -0000 1.10 *************** *** 39,43 **** #define DAYS_SINCE_1970 (8*365+2) ! static _PR_MD_Timeout _PR_Sleep(PRIntervalTime timeout) { PRThread *thread = PR_GetCurrentThread(); --- 39,43 ---- #define DAYS_SINCE_1970 (8*365+2) ! _PR_MD_Timeout _PR_MD_Sleep(PRIntervalTime timeout) { PRThread *thread = PR_GetCurrentThread(); *************** *** 67,71 **** thread->sleepRequestUsed = PR_TRUE; SendIO((struct IORequest *)timerIO); ! _PR_MD_Wait(thread, PR_TRUE); if (_PR_PENDING_INTERRUPT(thread)) { --- 67,74 ---- thread->sleepRequestUsed = PR_TRUE; SendIO((struct IORequest *)timerIO); ! /* Don't clear the signal on Waiting since I could get notified before ! * I clear it (and become livelocked) ! */ ! _PR_MD_Wait(thread, PR_TRUE, PR_FALSE); if (_PR_PENDING_INTERRUPT(thread)) { *************** *** 84,89 **** if (!(CheckIO((struct IORequest *)timerIO))) { AbortIO((struct IORequest *)timerIO); - WaitIO((struct IORequest *)timerIO); } thread->io_pending = PR_FALSE; done: --- 87,93 ---- if (!(CheckIO((struct IORequest *)timerIO))) { AbortIO((struct IORequest *)timerIO); } + WaitIO((struct IORequest *)timerIO); + thread->io_pending = PR_FALSE; done: *************** *** 92,96 **** PR_IMPLEMENT(PRStatus) PR_Sleep(PRIntervalTime timeout) { ! _PR_MD_Timeout retval = _PR_Sleep(timeout); return (retval == SUCCESS || retval == TIMEDOUT) ? PR_SUCCESS : PR_FAILURE; } --- 96,100 ---- PR_IMPLEMENT(PRStatus) PR_Sleep(PRIntervalTime timeout) { ! _PR_MD_Timeout retval = _PR_MD_Sleep(timeout); return (retval == SUCCESS || retval == TIMEDOUT) ? PR_SUCCESS : PR_FAILURE; } *************** *** 131,141 **** */ LL_I2L(secs, tv.tv_sec); ! LL_I2L(mil, 1000000); LL_MUL(secs, secs, mil); LL_I2L(mil, tv.tv_usec); LL_ADD(retval, secs, mil); LL_I2L(offset, DAYS_SINCE_1970); ! LL_MUL(offset, offset, 86400); ! LL_MUL(offset, offset, 1000000); LL_ADD(retval, retval, offset); CloseDevice((struct IORequest *)tr); --- 135,147 ---- */ LL_I2L(secs, tv.tv_sec); ! LL_I2L(mil, PR_USEC_PER_SEC); LL_MUL(secs, secs, mil); LL_I2L(mil, tv.tv_usec); LL_ADD(retval, secs, mil); LL_I2L(offset, DAYS_SINCE_1970); ! LL_I2L(mil, 86400); ! LL_MUL(offset, offset, mil); ! LL_I2L(mil, PR_USEC_PER_SEC); ! LL_MUL(offset, offset, mil); LL_ADD(retval, retval, offset); CloseDevice((struct IORequest *)tr); |
From: Jeff S. <jsh...@us...> - 2004-12-29 00:11:07
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7702 Modified Files: athreads.c Log Message: Added another parameter to PR_MD_Wait -- do we clear the signal when we are done waiting. Most of the time it will be true. Thread registration via a4.library Moved the code which fills in the thread structure further up to prevent race conditions Created a PR_JoinThreadInternal so killThread can use it (and do a proper cleanup). Don't need primordial pointer for each thread anymore. procEntry needs all the global library bases since it can wake up before the parent (in a Forbid() too which is strange). Fixed typo for outputs for polling thread for system. Index: athreads.c =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga/athreads.c,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** athreads.c 11 Oct 2004 18:38:29 -0000 1.28 --- athreads.c 29 Dec 2004 00:10:55 -0000 1.29 *************** *** 35,43 **** #include <primpl.h> /* DEBUG threads */ ! /* #define DEBUG_ATHREADS*/ static PRStatus _InitThread(PRThread *pr); void _MD_Exit(); --- 35,47 ---- #include <primpl.h> + extern struct Library *A4Base; + #include <proto/a4.h> /* DEBUG threads */ ! /*#define DEBUG_ATHREADS*/ static PRStatus _InitThread(PRThread *pr); + static PRStatus PR_JoinThreadInternal(PRThread *thread, PRBool); + void _MD_Exit(); *************** *** 52,59 **** _PR_MD_Signal(thread); Permit(); ! PR_JoinThread(thread); } else if (!thread->daemon) { ! PR_Interrupt(thread); ! PR_JoinThread(thread); } #ifdef DEBUG_ATHREADS --- 56,63 ---- _PR_MD_Signal(thread); Permit(); ! PR_JoinThreadInternal(thread, PR_TRUE); } else if (!thread->daemon) { ! /* PR_Interrupt(thread);*/ ! PR_JoinThreadInternal(thread, PR_TRUE); } #ifdef DEBUG_ATHREADS *************** *** 88,97 **** void _MD_Early_Init(void) { PRThread *thread; ! Printf("MD_Early_Init\n"); ! Flush(Output()); thread = PR_NEWZAP(PRThread); primordialThread = thread; thread->p = (struct Process *)FindTask(NULL); - thread->primordialThread = thread->p; thread->parent = NULL; thread->p->pr_Task.tc_UserData = thread; --- 92,99 ---- void _MD_Early_Init(void) { PRThread *thread; ! thread = PR_NEWZAP(PRThread); primordialThread = thread; thread->p = (struct Process *)FindTask(NULL); thread->parent = NULL; thread->p->pr_Task.tc_UserData = thread; *************** *** 105,108 **** --- 107,111 ---- setvbuf(stdout, NULL, _IONBF, 0); atexit(_MD_Exit); + atexit(PR_Cleanup); _PR_InitSocket(); _PR_InitRandom(); *************** *** 149,153 **** PR_ASSERT(pr->selectPort); pr->interruptSignal = AllocSignal(-1); - pr->primordialThread = primordialThread->p; PR_ASSERT(pr->interruptSignal != -1); --- 152,155 ---- *************** *** 166,169 **** --- 168,172 ---- /* Just in case */ PR_INIT_CLIST(&pr->waitQLinks); + return PR_SUCCESS; } *************** *** 206,210 **** if (join != NULL) { #ifdef DEBUG_ATHREADS ! printf("%lx done, signalling parent %lx\n", me, join); #endif PR_ASSERT(join->state == _PR_JOIN_WAIT); --- 209,214 ---- if (join != NULL) { #ifdef DEBUG_ATHREADS ! printf("%lx done, signalling parent %lx,state is %d\n", me, join, join->state); ! fflush(stdout); #endif PR_ASSERT(join->state == _PR_JOIN_WAIT); *************** *** 215,218 **** --- 219,225 ---- * PR_Free(me); */ + if (primordialThread != me) { + UnregisterThread(me->p); + } } *************** *** 220,235 **** * First code called when the thread starts */ ! static void procEntry(void) { PRThread *pr; ! struct Library *ixemulbase; - #ifdef DEBUG_ATHREADS - printf("In procEntry\n"); - fflush(stdout); - #endif /* Hack. I need to wait for the parent to initialize some things for me */ Wait(SIGBREAKF_CTRL_F); pr = PR_GetCurrentThread(); - // ixemulbase = OpenLibrary("ixemul.library", 0); _InitThread(pr); /* We are done initialization, signal the parent */ --- 227,247 ---- * First code called when the thread starts */ ! static void ! #if 0 ! __attribute__((saveds)) ! #endif ! procEntry(void) { ! /* It may be possible for me to start (and restore a4) before the parent ! * can register my thread. That is why I have a local copy of SysBase ! * and DOSBase here -- so I don't reference any a4-relative variables ! */ PRThread *pr; ! struct ExecBase *SysBase = *(struct ExecBase **)4L; ! struct Library *DOSBase = OpenLibrary("dos.library", 0); /* Hack. I need to wait for the parent to initialize some things for me */ Wait(SIGBREAKF_CTRL_F); + pr = PR_GetCurrentThread(); _InitThread(pr); /* We are done initialization, signal the parent */ *************** *** 245,248 **** --- 257,261 ---- } procExit(pr); + CloseLibrary(DOSBase); } *************** *** 291,295 **** --- 304,318 ---- if (stackSize < 32768) stackSize = 32768; + Forbid(); + thread->parent = me; + /* Add this thread to our list of threads */ + thread->next = me->next; + if (me->next) { + me->next->prev = thread; + } + me->next = thread; + thread->prev = me; + thread->p = CreateNewProcTags(NP_StackSize, stackSize, NP_Name, "NSPR Thread", *************** *** 303,306 **** --- 326,334 ---- if(thread->p != NULL) { + /* + * Need to register the a4 context for the thread + */ + RegisterThread(thread->p, primordialThread->p); + thread->p->pr_Task.tc_UserData = thread; /* Hack for ixemul.library to work */ *************** *** 308,324 **** thread->p->pr_Task.tc_TrapData = me->p->pr_Task.tc_TrapData; - thread->parent = me; - thread->primordialThread = primordialThread->p; - - /* Add this thread to our list of threads */ - thread->next = me->next; - if (me->next) { - me->next->prev = thread; - } - me->next = thread; - thread->prev = me; - /* Put this before signal just in case */ me->state = _PR_SUSPENDED; /* Hack because the new thread is waiting for us to do this */ Signal((struct Task *)thread->p, SIGBREAKF_CTRL_F); --- 336,342 ---- thread->p->pr_Task.tc_TrapData = me->p->pr_Task.tc_TrapData; /* Put this before signal just in case */ me->state = _PR_SUSPENDED; + /* Hack because the new thread is waiting for us to do this */ Signal((struct Task *)thread->p, SIGBREAKF_CTRL_F); *************** *** 327,331 **** * a PR_JoinThread before the thread comes up fully */ ! _PR_MD_Wait(me, PR_FALSE); me->state = _PR_RUNNING; --- 345,349 ---- * a PR_JoinThread before the thread comes up fully */ ! _PR_MD_Wait(me, PR_FALSE, PR_TRUE); me->state = _PR_RUNNING; *************** *** 348,357 **** } PR_IMPLEMENT(PRStatus) PR_JoinThread(PRThread *thread) { PRThread *me = PR_GetCurrentThread(); char buf[50]; struct MsgPort *port; ! if (thread->threadState == PR_UNJOINABLE_THREAD) return PR_FAILURE; --- 366,382 ---- } + PR_IMPLEMENT(PRStatus) PR_JoinThread(PRThread *thread) { + return PR_JoinThreadInternal(thread, PR_FALSE); + } + + static PRStatus PR_JoinThreadInternal(PRThread *thread, + PRBool allowJoinsOnUnjoinableThreads) { PRThread *me = PR_GetCurrentThread(); char buf[50]; struct MsgPort *port; ! if (thread->threadState == PR_UNJOINABLE_THREAD && ! !allowJoinsOnUnjoinableThreads) return PR_FAILURE; *************** *** 366,374 **** return PR_SUCCESS; } - thread->join = me; - me->state = _PR_JOIN_WAIT; Permit(); ! _PR_MD_Wait(me, PR_FALSE); me->state = _PR_RUNNING; return PR_SUCCESS; --- 391,403 ---- return PR_SUCCESS; } me->state = _PR_JOIN_WAIT; + thread->join = me; + /* + * Don't clear the signal since the thread may finish by the + * time I get to waiting + */ + _PR_MD_Wait(me, PR_FALSE, PR_FALSE); Permit(); ! me->state = _PR_RUNNING; return PR_SUCCESS; *************** *** 436,439 **** --- 465,472 ---- void _MD_Exit(void) { + #ifdef DEBUG_ATHREADS + Printf("_MD_Exit\n"); + Flush(Output()); + #endif if (_pr_initialized) { /* I need to kill the socket thread before killing off *************** *** 471,477 **** } /* PR_Cleanup */ ! void _PR_MD_Wait(PRThread *thread, PRBool interruptable) { ULONG mySig = 1 << thread->port->mp_SigBit; - PRBool blocked; /* See if someone is trying to kill me by setting my state to dead */ --- 504,509 ---- } /* PR_Cleanup */ ! void _PR_MD_Wait(PRThread *thread, PRBool interruptable, PRBool clearSignal) { ULONG mySig = 1 << thread->port->mp_SigBit; /* See if someone is trying to kill me by setting my state to dead */ *************** *** 484,493 **** Forbid(); ! SetSignal(0, mySig); if (interruptable == PR_TRUE) { ULONG interruptSig = 1 << thread->interruptSignal; ULONG sigs = mySig | interruptSig; PR_ASSERT(thread->state != _PR_RUNNING); - blocked = (thread->flags & _PR_INTERRUPT_BLOCKED) ? PR_TRUE : PR_FALSE; Wait(sigs); } else { --- 516,525 ---- Forbid(); ! if (clearSignal) ! SetSignal(0, mySig); if (interruptable == PR_TRUE) { ULONG interruptSig = 1 << thread->interruptSignal; ULONG sigs = mySig | interruptSig; PR_ASSERT(thread->state != _PR_RUNNING); Wait(sigs); } else { *************** *** 548,552 **** PRBool done = PR_FALSE; #ifdef DEBUG_ATHREADS ! printf("FD polling thread started, numfds is %d\n", numfds); #endif while (!done) { --- 580,584 ---- PRBool done = PR_FALSE; #ifdef DEBUG_ATHREADS ! printf("FD polling thread started, numfds is %d\n", mpp->numfds); #endif while (!done) { *************** *** 687,694 **** items[i++].ti_Data = pipeout->secret->md.osfd; } else { ! items[i].ti_Tag = NP_CloseInput; items[i++].ti_Data = FALSE; ! items[i].ti_Tag = SYS_Input; ! items[i++].ti_Data = Input(); } --- 719,726 ---- items[i++].ti_Data = pipeout->secret->md.osfd; } else { ! items[i].ti_Tag = NP_CloseOutput; items[i++].ti_Data = FALSE; ! items[i].ti_Tag = SYS_Output; ! items[i++].ti_Data = Output(); } *************** *** 771,776 **** char *const *envp, const PRProcessAttr *attr) { PRProcess *retval = PR_NEWZAP(PRProcess); ! PRLock *lock; ! PRCondVar *cv; if (retval == NULL) { PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0); --- 803,808 ---- char *const *envp, const PRProcessAttr *attr) { PRProcess *retval = PR_NEWZAP(PRProcess); ! PRLock *lock = NULL; ! PRCondVar *cv = NULL; if (retval == NULL) { PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0); |
From: Jeff S. <jsh...@us...> - 2004-12-29 00:07:20
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7555 Modified Files: alock.c Log Message: Updated _PR_MD_Wait call. Index: alock.c =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga/alock.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** alock.c 4 Jul 2004 22:37:52 -0000 1.4 --- alock.c 29 Dec 2004 00:07:03 -0000 1.5 *************** *** 65,69 **** me->wait.lock = lock; me->state = _PR_LOCK_WAIT; ! _PR_MD_Wait(me, PR_FALSE); me->state = _PR_RUNNING; } --- 65,69 ---- me->wait.lock = lock; me->state = _PR_LOCK_WAIT; ! _PR_MD_Wait(me, PR_FALSE, PR_TRUE); me->state = _PR_RUNNING; } *************** *** 117,118 **** --- 117,131 ---- void _PR_InitLocks(void){ } + + NSPR_API(PRStatus)PRP_TryLock(PRLock *lock) { + PRThread *me = PR_GetCurrentThread(); + PRStatus rv = PR_SUCCESS; + Forbid(); + if (lock->owner != NULL) { + rv = PR_FAILURE; + } + PR_Lock(lock); + end: + Permit(); + return rv; + } |
From: Jeff S. <jsh...@us...> - 2004-12-28 23:48:37
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3970 Modified Files: asocket.c Log Message: Added getservbyname and getservbyport to use the thread-based AmiTCP base. Index: asocket.c =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga/asocket.c,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** asocket.c 30 Nov 2004 08:49:29 -0000 1.28 --- asocket.c 28 Dec 2004 23:48:26 -0000 1.29 *************** *** 1894,1895 **** --- 1894,1913 ---- } + struct servent *getservbyname(const char *name, const char *proto) { + PRThread *me = PR_GetCurrentThread(); + if (AMITCP_BASE_NAME) { + return TCP_GetServByName(name, proto); + } else { + return NULL; + } + } + + struct servent *getservbyport(int port, const char *proto) { + PRThread *me = PR_GetCurrentThread(); + if (AMITCP_BASE_NAME) { + return TCP_GetServByPort(port, proto); + } else { + return NULL; + } + } + |
From: Oliver B. <o1...@us...> - 2004-11-30 08:49:46
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16700 Modified Files: asocket.c Log Message: fixed one warning and removed a ',' which seemed wrong (and caused another warning). Index: asocket.c =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga/asocket.c,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** asocket.c 27 Nov 2004 23:40:15 -0000 1.27 --- asocket.c 30 Nov 2004 08:49:29 -0000 1.28 *************** *** 308,312 **** struct TagItem tags[] = { { SBTM_SETVAL(SBTC_DTABLESIZE), num + 64 }, ! { TAG_DONE, NULL } }; --- 308,312 ---- struct TagItem tags[] = { { SBTM_SETVAL(SBTC_DTABLESIZE), num + 64 }, ! { TAG_DONE, TAG_DONE } }; *************** *** 1027,1031 **** } ! retval = local_io_wait,(fd, TYPE_WRITE, timeout); if (_PR_PENDING_INTERRUPT(me)) { #ifdef DEBUG_ASOCKET --- 1027,1031 ---- } ! retval = local_io_wait(fd, TYPE_WRITE, timeout); if (_PR_PENDING_INTERRUPT(me)) { #ifdef DEBUG_ASOCKET |
From: Jeff S. <jsh...@us...> - 2004-11-28 00:20:16
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29033 Modified Files: adir.c Log Message: More error checking. Index: adir.c =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga/adir.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** adir.c 1 Jul 2004 17:32:16 -0000 1.5 --- adir.c 27 Nov 2004 23:37:30 -0000 1.6 *************** *** 50,54 **** --- 50,58 ---- return PR_SUCCESS; } + } else { + PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0); } + } else { + PR_SetError(PR_FILE_NOT_FOUND_ERROR, 0); } *************** *** 73,76 **** --- 77,87 ---- } return md->info->fib_FileName; + } else { + int err = IoErr(); + if (err == ERROR_NO_MORE_ENTRIES) { + PR_SetError(PR_NO_MORE_FILES_ERROR, 0); + } else { + _MD_MapIOErr(err); + } } *************** *** 97,100 **** --- 108,117 ---- BPTR lock; + if ((lock = Lock(name, SHARED_LOCK)) != NULL) { + UnLock(lock); + PR_SetError(PR_FILE_EXISTS_ERROR, 0); + return PR_FAILURE; + } + if((lock = CreateDir(name)) != (BPTR)NULL) { UnLock(lock); |
From: Jeff S. <jsh...@us...> - 2004-11-27 23:40:26
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29640 Modified Files: asocket.c Log Message: Took out false assertion on MD_NATIVE_HANDLE. Index: asocket.c =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga/asocket.c,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** asocket.c 11 Oct 2004 18:50:39 -0000 1.26 --- asocket.c 27 Nov 2004 23:40:15 -0000 1.27 *************** *** 52,56 **** /* DEBUG sockets */ ! /*#define DEBUG_ASOCKET */ /* --- 52,56 ---- /* DEBUG sockets */ ! /*#define DEBUG_ASOCKET*/ /* *************** *** 1700,1704 **** */ int _MD_NATIVE_HANDLE(PRFileDesc *fd) { - PR_ASSERT(FALSE); switch (fd->methods->file_type) { case PR_DESC_PIPE: --- 1700,1703 ---- *************** *** 1894,1895 **** --- 1893,1895 ---- return TCP_Errno(); } + |
From: Jeff S. <jsh...@us...> - 2004-11-27 23:39:46
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29470 Modified Files: arandom.c Log Message: Put debug lines around printf. Index: arandom.c =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga/arandom.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** arandom.c 14 Oct 2004 14:25:51 -0000 1.6 --- arandom.c 27 Nov 2004 23:39:31 -0000 1.7 *************** *** 218,223 **** --- 218,225 ---- while (size) { while ((front - back) % BUFFERSIZE == 0) { + #ifdef DEBUG_RANDOM printf("Buffer empty, waiting...\n"); fflush(stdout); + #endif PR_WaitCondVar(emptycv, PR_INTERVAL_NO_TIMEOUT); } |
From: Jeff S. <jsh...@us...> - 2004-11-21 18:10:46
|
Update of /cvsroot/amizilla/amizilla/nsprpub In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5448 Modified Files: configure.in configure Log Message: Canonicalize the AmigaOS target -- they are different if you are cross-compiling Index: configure =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/configure,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** configure 11 Oct 2004 18:54:01 -0000 1.6 --- configure 21 Nov 2004 18:09:32 -0000 1.7 *************** *** 2789,2792 **** --- 2789,2795 ---- fi + if test "$OS_ARCH" = "amigaos"; then + OS_ARCH="AmigaOS"; + fi ####################################################################### # Master "Core Components" macros for getting the OS target # *************** *** 2942,2956 **** ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6 ! echo "configure:2945: checking for sys/atomic_op.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 2950 "configure" #include "confdefs.h" #include <sys/atomic_op.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:2955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then --- 2945,2959 ---- ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6 ! echo "configure:2948: checking for sys/atomic_op.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 2953 "configure" #include "confdefs.h" #include <sys/atomic_op.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:2958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then *************** *** 3116,3120 **** MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@' echo $ac_n "checking for gethostbyaddr in -lbind""... $ac_c" 1>&6 ! echo "configure:3119: checking for gethostbyaddr in -lbind" >&5 ac_lib_var=`echo bind'_'gethostbyaddr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then --- 3119,3123 ---- MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@' echo $ac_n "checking for gethostbyaddr in -lbind""... $ac_c" 1>&6 ! echo "configure:3122: checking for gethostbyaddr in -lbind" >&5 ac_lib_var=`echo bind'_'gethostbyaddr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then *************** *** 3124,3128 **** LIBS="-lbind $LIBS" cat > conftest.$ac_ext <<EOF ! #line 3127 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ --- 3127,3131 ---- LIBS="-lbind $LIBS" cat > conftest.$ac_ext <<EOF ! #line 3130 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ *************** *** 3135,3139 **** ; return 0; } EOF ! if { (eval echo configure:3138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" --- 3138,3142 ---- ; return 0; } EOF ! if { (eval echo configure:3141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" *************** *** 4318,4332 **** ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6 ! echo "configure:4321: checking for machine/builtins.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 4326 "configure" #include "confdefs.h" #include <machine/builtins.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:4331: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then --- 4321,4335 ---- ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6 ! echo "configure:4324: checking for machine/builtins.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 4329 "configure" #include "confdefs.h" #include <machine/builtins.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:4334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then *************** *** 4841,4850 **** echo $ac_n "checking for dlopen""... $ac_c" 1>&6 ! echo "configure:4844: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 4849 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, --- 4844,4853 ---- echo $ac_n "checking for dlopen""... $ac_c" 1>&6 ! echo "configure:4847: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 4852 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, *************** *** 4869,4873 **** ; return 0; } EOF ! if { (eval echo configure:4872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" --- 4872,4876 ---- ; return 0; } EOF ! if { (eval echo configure:4875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" *************** *** 4888,4892 **** echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 ! echo "configure:4891: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then --- 4891,4895 ---- echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 ! echo "configure:4894: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then *************** *** 4896,4900 **** LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF ! #line 4899 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ --- 4899,4903 ---- LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF ! #line 4902 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ *************** *** 4907,4911 **** ; return 0; } EOF ! if { (eval echo configure:4910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" --- 4910,4914 ---- ; return 0; } EOF ! if { (eval echo configure:4913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" *************** *** 4935,4939 **** if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 ! echo "configure:4938: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 4938,4942 ---- if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 ! echo "configure:4941: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 4941,4945 **** ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext <<EOF ! #line 4944 "configure" #include "confdefs.h" #include <sgtty.h> --- 4944,4948 ---- ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext <<EOF ! #line 4947 "configure" #include "confdefs.h" #include <sgtty.h> *************** *** 4959,4963 **** if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF ! #line 4962 "configure" #include "confdefs.h" #include <termio.h> --- 4962,4966 ---- if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF ! #line 4965 "configure" #include "confdefs.h" #include <termio.h> *************** *** 4983,4992 **** do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:4986: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 4991 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, --- 4986,4995 ---- do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:4989: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 4994 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, *************** *** 5011,5015 **** ; return 0; } EOF ! if { (eval echo configure:5014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" --- 5014,5018 ---- ; return 0; } EOF ! if { (eval echo configure:5017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" *************** *** 5050,5054 **** echo $ac_n "checking for +Olit support""... $ac_c" 1>&6 ! echo "configure:5053: checking for +Olit support" >&5 if eval "test \"`echo '$''{'ac_cv_hpux_usable_olit_option'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 5053,5057 ---- echo $ac_n "checking for +Olit support""... $ac_c" 1>&6 ! echo "configure:5056: checking for +Olit support" >&5 if eval "test \"`echo '$''{'ac_cv_hpux_usable_olit_option'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 5084,5088 **** echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 ! echo "configure:5087: checking for pthread_create in -lpthreads" >&5 echo " #include <pthread.h> --- 5087,5091 ---- echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 ! echo "configure:5090: checking for pthread_create in -lpthreads" >&5 echo " #include <pthread.h> *************** *** 5106,5110 **** echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 ! echo "configure:5109: checking for pthread_create in -lpthread" >&5 echo " #include <pthread.h> --- 5109,5113 ---- echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 ! echo "configure:5112: checking for pthread_create in -lpthread" >&5 echo " #include <pthread.h> *************** *** 5128,5132 **** echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 ! echo "configure:5131: checking for pthread_create in -lc_r" >&5 echo " #include <pthread.h> --- 5131,5135 ---- echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 ! echo "configure:5134: checking for pthread_create in -lc_r" >&5 echo " #include <pthread.h> *************** *** 5150,5154 **** echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 ! echo "configure:5153: checking for pthread_create in -lc" >&5 echo " #include <pthread.h> --- 5153,5157 ---- echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 ! echo "configure:5156: checking for pthread_create in -lc" >&5 echo " #include <pthread.h> *************** *** 5302,5306 **** ac_cv_have_dash_pthread=no echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 ! echo "configure:5305: checking whether ${CC-cc} accepts -pthread" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 --- 5305,5309 ---- ac_cv_have_dash_pthread=no echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 ! echo "configure:5308: checking whether ${CC-cc} accepts -pthread" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 *************** *** 5325,5329 **** if test "$ac_cv_have_dash_pthread" = "no"; then echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 ! echo "configure:5328: checking whether ${CC-cc} accepts -pthreads" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 --- 5328,5332 ---- if test "$ac_cv_have_dash_pthread" = "no"; then echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 ! echo "configure:5331: checking whether ${CC-cc} accepts -pthreads" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 Index: configure.in =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/configure.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** configure.in 11 Oct 2004 18:54:01 -0000 1.3 --- configure.in 21 Nov 2004 18:09:32 -0000 1.4 *************** *** 563,566 **** --- 563,569 ---- fi + if test "$OS_ARCH" = "amigaos"; then + OS_ARCH="AmigaOS"; + fi ####################################################################### # Master "Core Components" macros for getting the OS target # |
From: Jeff S. <jsh...@us...> - 2004-11-21 18:09:59
|
Update of /cvsroot/amizilla/amizilla/nsprpub/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5228 Modified Files: Makefile.in Log Message: Amiga-specific defines. I need ixemul (for getuid() stuff) and I don't need baserel32. Index: Makefile.in =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/config/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.in 19 Jul 2003 08:35:02 -0000 1.4 --- Makefile.in 21 Nov 2004 18:08:20 -0000 1.5 *************** *** 95,98 **** --- 95,104 ---- endif + ifeq ($(OS_ARCH), AmigaOS) + DSO_CFLAGS= + # I need ixemul for nsinstall + OS_LDFLAGS= + endif + ifeq ($(MOZ_OS2_TOOLS),EMX) XCFLAGS = $(OS_CFLAGS) |
From: Jeff S. <jsh...@us...> - 2004-11-18 23:43:58
|
Update of /cvsroot/amizilla/amizilla/xpcom/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18467 Modified Files: nsXPComInit.cpp Log Message: a2ixlibrary changed the public header filename. Index: nsXPComInit.cpp =================================================================== RCS file: /cvsroot/amizilla/amizilla/xpcom/build/nsXPComInit.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** nsXPComInit.cpp 11 Oct 2004 21:07:50 -0000 1.2 --- nsXPComInit.cpp 18 Nov 2004 23:43:48 -0000 1.3 *************** *** 115,119 **** #ifdef XP_AMIGAOS #include "nspr.h" ! #include "nspr4.h" #endif --- 115,119 ---- #ifdef XP_AMIGAOS #include "nspr.h" ! #include "nspr4_ixlibrary.h" #endif *************** *** 281,284 **** --- 281,285 ---- extern void _MD_Exit(void); } + static void NS_COM closeXPCOM(void) { |
From: Jeff S. <jsh...@us...> - 2004-11-18 23:43:23
|
Update of /cvsroot/amizilla/amizilla/nsprpub/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18211 Modified Files: rules.mk Log Message: a2ixlibrary now generates a different public header filename. Index: rules.mk =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/config/rules.mk,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** rules.mk 12 Oct 2004 23:28:19 -0000 1.5 --- rules.mk 18 Nov 2004 23:42:57 -0000 1.6 *************** *** 130,134 **** IMPORT_LIBRARY_X = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).x IMPORT_LIBRARY_A = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_ixlibrary.a ! IMPORT_LIBRARY_H = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).h endif endif --- 130,134 ---- IMPORT_LIBRARY_X = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).x IMPORT_LIBRARY_A = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_ixlibrary.a ! IMPORT_LIBRARY_H = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)_ixlibrary.h endif endif |
From: Jeff S. <jsh...@us...> - 2004-11-18 23:39:57
|
Update of /cvsroot/amizilla/amizilla/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17348 Modified Files: rules.mk Log Message: a2ixlibrary has a different public header filename. Index: rules.mk =================================================================== RCS file: /cvsroot/amizilla/amizilla/config/rules.mk,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** rules.mk 29 Oct 2004 00:20:44 -0000 1.3 --- rules.mk 18 Nov 2004 23:39:47 -0000 1.4 *************** *** 152,156 **** LIBRARY_IX_SHLIB := $(LIBRARY_NAME).ix LIBRARY_IX := $(LIB_PREFIX)$(LIBRARY_NAME)_ixlibrary.a ! LIBRARY_H := $(LIBRARY_NAME).h endif --- 152,156 ---- LIBRARY_IX_SHLIB := $(LIBRARY_NAME).ix LIBRARY_IX := $(LIB_PREFIX)$(LIBRARY_NAME)_ixlibrary.a ! LIBRARY_H := $(LIBRARY_NAME)_ixlibrary.h endif |
From: Jeff S. <jsh...@us...> - 2004-10-29 00:20:53
|
Update of /cvsroot/amizilla/amizilla/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18413 Modified Files: rules.mk Log Message: string is a part of xpcom as well. Index: rules.mk =================================================================== RCS file: /cvsroot/amizilla/amizilla/config/rules.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rules.mk 11 Oct 2004 20:32:17 -0000 1.2 --- rules.mk 29 Oct 2004 00:20:44 -0000 1.3 *************** *** 193,197 **** ifdef BUILD_SHARED_LIBS ! ifneq ($(MODULE), xpcom) # HACK. I don't need these when building xpcom! EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) --- 193,197 ---- ifdef BUILD_SHARED_LIBS ! ifeq (,$(filter xpcom string, $(MODULE))) # HACK. I don't need these when building xpcom! EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) |