diff --git a/mozilla/dom/src/build/makefile.win b/mozilla/dom/src/build/makefile.win index 003ad13af1a..b904f0e379b 100644 --- a/mozilla/dom/src/build/makefile.win +++ b/mozilla/dom/src/build/makefile.win @@ -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> diff --git a/mozilla/gfx/public/makefile.win b/mozilla/gfx/public/makefile.win index 2ee836e2bf7..01f42899f3a 100644 --- a/mozilla/gfx/public/makefile.win +++ b/mozilla/gfx/public/makefile.win @@ -45,8 +45,6 @@ EXPORTS = \ nsIDeviceContextSpecFactory.h \ nsIDrawingSurface.h \ nsColorNameIDs.h \ - nsITimer.h \ - nsITimerCallback.h \ $(NULL) MODULE=raptor diff --git a/mozilla/gfx/src/makefile.win b/mozilla/gfx/src/makefile.win index c62418b2581..3808a5f0d51 100644 --- a/mozilla/gfx/src/makefile.win +++ b/mozilla/gfx/src/makefile.win @@ -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 diff --git a/mozilla/gfx/src/windows/makefile.win b/mozilla/gfx/src/windows/makefile.win index 236231c4cd5..b647e126711 100644 --- a/mozilla/gfx/src/windows/makefile.win +++ b/mozilla/gfx/src/windows/makefile.win @@ -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 - diff --git a/mozilla/layout/build/makefile.win b/mozilla/layout/build/makefile.win index fc5016941fa..2ff55956fac 100644 --- a/mozilla/layout/build/makefile.win +++ b/mozilla/layout/build/makefile.win @@ -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 diff --git a/mozilla/layout/html/tests/makefile.win b/mozilla/layout/html/tests/makefile.win index a6b4addabf4..d47455d97ec 100644 --- a/mozilla/layout/html/tests/makefile.win +++ b/mozilla/layout/html/tests/makefile.win @@ -66,6 +66,7 @@ LLIBS= \ !else $(DIST)\lib\netlib.lib \ !endif + $(DIST)\lib\timer_s.lib \ $(LIBNSPR) \ $(DIST)\lib\js32$(VERSION_NUMBER).lib diff --git a/mozilla/mailnews/base/build/makefile.win b/mozilla/mailnews/base/build/makefile.win index 8d75e4b68d9..311f3de0016 100644 --- a/mozilla/mailnews/base/build/makefile.win +++ b/mozilla/mailnews/base/build/makefile.win @@ -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> diff --git a/mozilla/makefile.win b/mozilla/makefile.win index 903c73c121d..122e9c57c68 100644 --- a/mozilla/makefile.win +++ b/mozilla/makefile.win @@ -49,6 +49,7 @@ DIRS = \ modules\libjar \ modules\libutil \ sun-java \ + timer \ js \ modules\security\freenav \ modules\libimg \ diff --git a/mozilla/rdf/build/makefile.win b/mozilla/rdf/build/makefile.win index 5d75168d343..865f67ee4f8 100644 --- a/mozilla/rdf/build/makefile.win +++ b/mozilla/rdf/build/makefile.win @@ -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 diff --git a/mozilla/timer/public/nsITimer.h b/mozilla/timer/public/nsITimer.h index e35a5a722f3..b47eeba5f4d 100644 --- a/mozilla/timer/public/nsITimer.h +++ b/mozilla/timer/public/nsITimer.h @@ -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___ + diff --git a/mozilla/timer/src/beos/nsTimer.cpp b/mozilla/timer/src/beos/nsTimer.cpp index 57aed4c1d70..6f1491c3131 100644 --- a/mozilla/timer/src/beos/nsTimer.cpp +++ b/mozilla/timer/src/beos/nsTimer.cpp @@ -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) diff --git a/mozilla/timer/src/mac/nsTimer.cpp b/mozilla/timer/src/mac/nsTimer.cpp index c2f6e8d859f..8a6b2cff3e1 100644 --- a/mozilla/timer/src/mac/nsTimer.cpp +++ b/mozilla/timer/src/mac/nsTimer.cpp @@ -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) { diff --git a/mozilla/timer/src/os2/nsTimerOS2.cpp b/mozilla/timer/src/os2/nsTimerOS2.cpp index b3a1fbaa257..90b68a3db9f 100644 --- a/mozilla/timer/src/os2/nsTimerOS2.cpp +++ b/mozilla/timer/src/os2/nsTimerOS2.cpp @@ -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; diff --git a/mozilla/timer/src/photon/nsTimer.cpp b/mozilla/timer/src/photon/nsTimer.cpp index 89cee121bea..61682bb9724 100644 --- a/mozilla/timer/src/photon/nsTimer.cpp +++ b/mozilla/timer/src/photon/nsTimer.cpp @@ -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) diff --git a/mozilla/timer/src/rhapsody/nsTimer.cpp b/mozilla/timer/src/rhapsody/nsTimer.cpp index 266d7fecef5..c7d9377a39e 100644 --- a/mozilla/timer/src/rhapsody/nsTimer.cpp +++ b/mozilla/timer/src/rhapsody/nsTimer.cpp @@ -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) { diff --git a/mozilla/timer/src/unix/gtk/nsTimerGtk.cpp b/mozilla/timer/src/unix/gtk/nsTimerGtk.cpp index 500d2f3e4f0..fd6d86b2513 100644 --- a/mozilla/timer/src/unix/gtk/nsTimerGtk.cpp +++ b/mozilla/timer/src/unix/gtk/nsTimerGtk.cpp @@ -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) { diff --git a/mozilla/timer/src/unix/motif/nsTimerMotif.cpp b/mozilla/timer/src/unix/motif/nsTimerMotif.cpp index b1a55f8267d..69a49af6b6f 100644 --- a/mozilla/timer/src/unix/motif/nsTimerMotif.cpp +++ b/mozilla/timer/src/unix/motif/nsTimerMotif.cpp @@ -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) { diff --git a/mozilla/timer/src/unix/xlib/nsTimerXlib.cpp b/mozilla/timer/src/unix/xlib/nsTimerXlib.cpp index d1209a08483..093c3fdf316 100644 --- a/mozilla/timer/src/unix/xlib/nsTimerXlib.cpp +++ b/mozilla/timer/src/unix/xlib/nsTimerXlib.cpp @@ -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) { diff --git a/mozilla/timer/src/windows/makefile.win b/mozilla/timer/src/windows/makefile.win index 2f1f09432f9..f0a4cdd9e75 100644 --- a/mozilla/timer/src/windows/makefile.win +++ b/mozilla/timer/src/windows/makefile.win @@ -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> diff --git a/mozilla/timer/src/windows/nsTimer.cpp b/mozilla/timer/src/windows/nsTimer.cpp index 8da495f6788..4810ed39576 100644 --- a/mozilla/timer/src/windows/nsTimer.cpp +++ b/mozilla/timer/src/windows/nsTimer.cpp @@ -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) { diff --git a/mozilla/view/src/makefile.win b/mozilla/view/src/makefile.win index afef6bc55ba..8c367e56571 100644 --- a/mozilla/view/src/makefile.win +++ b/mozilla/view/src/makefile.win @@ -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> diff --git a/mozilla/webshell/src/makefile.win b/mozilla/webshell/src/makefile.win index f0e0fa41476..3e1db82e360 100644 --- a/mozilla/webshell/src/makefile.win +++ b/mozilla/webshell/src/makefile.win @@ -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 \ diff --git a/mozilla/webshell/tests/viewer/makefile.win b/mozilla/webshell/tests/viewer/makefile.win index 9b6c6f05b76..254f7a582f6 100644 --- a/mozilla/webshell/tests/viewer/makefile.win +++ b/mozilla/webshell/tests/viewer/makefile.win @@ -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 \ diff --git a/mozilla/xpcom/base/nscore.h b/mozilla/xpcom/base/nscore.h index 80e22a35713..345c133cfce 100644 --- a/mozilla/xpcom/base/nscore.h +++ b/mozilla/xpcom/base/nscore.h @@ -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