#58627

r=cls
Remove timer.dll from OS/2 build - make it a part of widget

config/autoconf.mk.in

@@ -330,6 +330,5 @@ OS_TEST=@OS_TEST@
 # For OS/2 build
 MOZ_OS2_TOOLS = @MOZ_OS2_TOOLS@
 MOZ_OS2_EMX_OBJECTFORMAT = @MOZ_OS2_EMX_OBJECTFORMAT@
-MOZ_TIMER_LIBS = $(DIST)/lib/timer.$(LIB_SUFFIX)
 
 HAVE_MOVEMAIL=@HAVE_MOVEMAIL@

widget/Makefile.in

@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= public src timer
+DIRS		= public timer src
 
 include $(topsrcdir)/config/rules.mk
 

widget/src/os2/Makefile.in

@@ -65,12 +65,13 @@ CPPSRCS		= \
 #		nsDataObj.cpp      \
 #		nsDataObjCollection.cpp      \
 
-SHARED_LIBRARY_LIBS = $(DIST)/lib/libxpwidgets_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS = $(DIST)/lib/libxpwidgets_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/libtimeros2_s.$(LIB_SUFFIX) \
+	$(NULL)
 
 EXTRA_DSO_LDOPTS = \
 	  	$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_TIMER_LIBS) \
 		$(NULL)
 
 ifeq ($(MOZ_OS2_TOOLS),VACPP)

widget/timer/src/os2/Makefile.in

@@ -36,9 +36,8 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= timer
-LIBRARY_NAME	= timer
-
+MODULE		= widget
+LIBRARY_NAME	= timeros2_s
 
 EXPORTS=nsTimerManager.h nsWindowsTimer.h nsIWindowsTimerMap.h os2TimerGlue.h
 
@@ -50,7 +49,9 @@ CPPSRCS =			\
 	$(NULL)
 
 
-EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS)
+# we don't want the shared lib, but we want to force the creation of a static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
 

widget/timer/src/os2/os2TimerGlue.cpp

@@ -70,14 +70,6 @@ MRESULT EXPENTRY fnwpTimer( HWND h, ULONG msg, MPARAM mp1, MPARAM mp2)
    return mRC;
 }
 
-TID QueryCurrentTID()
-{
-   PTIB pTib = 0;
-   PPIB pPib = 0;
-   DosGetInfoBlocks( &pTib, &pPib);
-   return pTib->tib_ptib2->tib2_ultid;
-}
-
 void EnsureWndClass()
 {
    static BOOL bRegistered = FALSE;