Landing timer move on windows.

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>

gfx/public/makefile.win

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

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

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
-	

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

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	
 

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>

makefile.win

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

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

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___
+

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)

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) {

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;

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)

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) {

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) {

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) {

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) {

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>

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) {

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>

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       \

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     \

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