Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Landing timer move on windows.

Browse Source
This commit is contained in:
ramiro%netscape.com 1999-07-17 15:52:01 +00:00
parent a09ea8b7ca
commit ba8ba82cc6
24 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom/src/build/makefile.win
View File

@ -71,6 +71,7 @@ LLIBS= \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\caps.lib \
$(DIST)\lib\oji.lib \
$(DIST)\lib\timer_s.lib \
$(LIBNSPR)
include <$(DEPTH)\config\rules.mak>

2
gfx/public/makefile.win
View File

@ -45,8 +45,6 @@ EXPORTS = \
nsIDeviceContextSpecFactory.h \
nsIDrawingSurface.h \
nsColorNameIDs.h \
nsITimer.h \
nsITimerCallback.h \
$(NULL)
MODULE=raptor

6
gfx/src/makefile.win
View File

@ -23,9 +23,9 @@ DIRS = windows
LIBRARY_NAME=raptorgfx_s
MODULE=raptor
!ifdef NECKO
REQUIRES=util img xpcom raptor necko
REQUIRES=util img xpcom raptor necko timer
!else
REQUIRES=util img xpcom raptor netlib
REQUIRES=util img xpcom raptor netlib timer
!endif
DEFINES=-D_IMPL_NS_GFX -DWIN32_LEAN_AND_MEAN
@ -72,7 +72,7 @@ libs:: $(LIBRARY)
install::
$(MAKE_INSTALL) icon_0.gif $(DIST)\bin\res\gfx
$(MAKE_INSTALL) icon_1.gif $(DIST)\bin\res\gfx
clobber::
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
rm -f $(PDBFILE).pdb

3
gfx/src/windows/makefile.win
View File

@ -41,7 +41,6 @@ OBJS = \
.\$(OBJDIR)\nsDeviceContextSpecWin.obj \
.\$(OBJDIR)\nsDeviceContextSpecFactoryW.obj \
.\$(OBJDIR)\nsGfxFactoryWin.obj \
.\$(OBJDIR)\nsTimer.obj \
$(NULL)
EXPORTS= nsIRenderingContextWin.h \
@ -78,6 +77,7 @@ LLIBS= \
$(DIST)\lib\netlib.lib \
!endif
$(DIST)\lib\raptorgfx_s.lib \
$(DIST)\lib\timer_s.lib \
!if defined(NGLAYOUT_DDRAW)
$(NGLAYOUT_DDRAW)\lib\ddraw.lib \
!endif
@ -107,4 +107,3 @@ install:: $(DLL)
clobber::
rm -f $(DIST)\bin\$(DLLNAME).dll
rm -f $(DIST)\lib\$(DLLNAME).lib

1
layout/build/makefile.win
View File

@ -71,6 +71,7 @@ LLIBS= \
$(DIST)\lib\raptorevents_s.lib \
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\raptorgfxwin.lib \
$(DIST)\lib\timer_s.lib \
$(DIST)\lib\raptorhtmlpars.lib \
$(DIST)\lib\jsdom.lib \
!ifdef NECKO

1
layout/html/tests/makefile.win
View File

@ -66,6 +66,7 @@ LLIBS= \
!else
$(DIST)\lib\netlib.lib \
!endif
$(DIST)\lib\timer_s.lib \
$(LIBNSPR) \
$(DIST)\lib\js32$(VERSION_NUMBER).lib

9
mailnews/base/build/makefile.win
View File

@ -33,14 +33,15 @@ CPP_OBJS= \
.\$(OBJDIR)\nsMsgFactory.obj \
$(NULL)
LLIBS= \
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\msgbaseutil.lib \
$(DIST)\lib\msgbase_s.lib \
$(DIST)\lib\msgsearch_s.lib \
$(DIST)\lib\msgsearch_s.lib \
$(DIST)\lib\netlib.lib \
$(DIST)\lib\raptorgfxwin.lib \
$(LIBNSPR) \
$(DIST)\lib\raptorgfxwin.lib \
$(DIST)\lib\timer_s.lib \
$(LIBNSPR) \
$(NULL)
include <$(DEPTH)/config/rules.mak>

1
makefile.win
View File

@ -49,6 +49,7 @@ DIRS = \
modules\libjar \
modules\libutil \
sun-java \
timer \
js \
modules\security\freenav \
modules\libimg \

1
rdf/build/makefile.win
View File

@ -38,6 +38,7 @@ LLIBS=\
$(DIST)\lib\rdfdatasource_s.lib \
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\raptorgfxwin.lib \
$(DIST)\lib\timer_s.lib \
!ifdef NECKO
$(DIST)\lib\neckoutil_s.lib \
!else

16
timer/public/nsITimer.h
View File

@ -90,13 +90,15 @@ public:
virtual void* GetClosure()=0;
};
/** Factory method for creating an nsITimer */
//
// Factory method for creating an nsITimer
//
// Warning: This function should NOT be defined with NS_TIMER because
// the intention is that it be linked statically with the library/DLL
// or app that uses it.
extern
#ifdef XP_MAC // On the macintosh, this is built into the network library.
NS_NET
#else
NS_TIMER
#endif
nsresult NS_NewTimer(nsITimer** aInstancePtrResult);
#endif
#endif // nsITimer_h___

2
timer/src/beos/nsTimer.cpp
View File

@ -341,7 +341,7 @@ void TimerImpl::Cancel()
TimerImpl::sTimerManager.RemoveRequest(this);
}
NS_TIMER nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
{
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
if(nsnull == aInstancePtrResult)

2
timer/src/mac/nsTimer.cpp
View File

@ -342,7 +342,7 @@ void TimerPeriodical::RepeatAction( const EventRecord &inMacEvent)
}
NS_TIMER nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
{
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
if (nsnull == aInstancePtrResult) {

2
timer/src/os2/nsTimerOS2.cpp
View File

@ -576,7 +576,7 @@ class nsTimerManagers
// Entry into the DLL. No, I dunno why there's not a normal factory
// for this either. Ease of use?
NS_TIMER nsresult NS_NewTimer( nsITimer **aInstance)
nsresult NS_NewTimer( nsITimer **aInstance)
{
if( !aInstance)
return NS_ERROR_NULL_POINTER;

2
timer/src/photon/nsTimer.cpp
View File

@ -246,7 +246,7 @@ int TimerImpl::TimerEventHandler( void *aData, pid_t aRcvId, void *aMsg, size_t
}
NS_TIMER nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
{
NS_PRECONDITION(nsnull != aInstancePtrResult, "NS_NewTimer - null ptr");
if (nsnull == aInstancePtrResult)

2
timer/src/rhapsody/nsTimer.cpp
View File

@ -177,7 +177,7 @@ TimerImpl::Cancel()
#endif
}
NS_TIMER nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
{
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
if (nsnull == aInstancePtrResult) {

2
timer/src/unix/gtk/nsTimerGtk.cpp
View File

@ -143,7 +143,7 @@ gint nsTimerExpired(gpointer aCallData)
return 0;
}
NS_TIMER nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
{
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
if (nsnull == aInstancePtrResult) {

2
timer/src/unix/motif/nsTimerMotif.cpp
View File

@ -118,7 +118,7 @@ void nsTimerExpired(XtPointer aCallData)
timer->FireTimeout();
}
NS_TIMER nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
{
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
if (nsnull == aInstancePtrResult) {

2
timer/src/unix/xlib/nsTimerXlib.cpp
View File

@ -238,7 +238,7 @@ void NS_ProcessTimeouts(void) {
nsTimerXlib::ProcessTimeouts(&now);
}
NS_TIMER nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
{
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
if (nsnull == aInstancePtrResult) {

4
timer/src/windows/makefile.win
View File

@ -18,7 +18,7 @@
DEPTH=..\..\..
LIBRARY_NAME=timer_s
DEFINES=-D_IMPL_NS_TIMER -DWIN32_LEAN_AND_MEAN -DSTRICT
DEFINES=-DWIN32_LEAN_AND_MEAN -DSTRICT
CPPSRCS = \
nsTimer.cpp \
@ -39,7 +39,7 @@ LINCS= \
LCFLAGS = \
$(LCFLAGS) \
$(DEFINES) \
$(DEFINES) \
$(NULL)
include <$(DEPTH)\config\rules.mak>

2
timer/src/windows/nsTimer.cpp
View File

@ -346,7 +346,7 @@ TimerImpl::Cancel()
SyncTimeoutPeriod(0);
}
NS_TIMER nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
{
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
if (nsnull == aInstancePtrResult) {

1
view/src/makefile.win
View File

@ -47,6 +47,7 @@ LCFLAGS = \
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\raptorgfxwin.lib \
$(DIST)\lib\timer_s.lib \
$(LIBNSPR)
include <$(DEPTH)\config\rules.mak>

1
webshell/src/makefile.win
View File

@ -73,6 +73,7 @@ LCFLAGS = \
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\raptorgfxwin.lib \
$(DIST)\lib\timer_s.lib \
$(DIST)\lib\img32$(VERSION_NUMBER).lib \
$(DIST)\lib\util.lib \
$(DIST)\lib\jsdom.lib \

1
webshell/tests/viewer/makefile.win
View File

@ -79,6 +79,7 @@ LINCS= \
LLIBS= \
$(DIST)\lib\raptorgfxwin.lib \
$(DIST)\lib\timer_s.lib \
$(DIST)\lib\raptorhtml.lib \
$(DIST)\lib\raptorweb.lib \
$(DIST)\lib\raptorwidget.lib \

6
xpcom/base/nscore.h
View File

@ -134,12 +134,6 @@ typedef PRUint16 PRUnichar;
#define NS_GFX_(type) NS_IMPORT_(type)
#endif
#ifdef _IMPL_NS_TIMER
#define NS_TIMER NS_EXPORT
#else
#define NS_TIMER NS_IMPORT
#endif
#ifdef _IMPL_NS_PLUGIN
#define NS_PLUGIN NS_EXPORT
#else