diff --git a/mozilla/nsprpub/pr/src/Makefile b/mozilla/nsprpub/pr/src/Makefile index 2cb11b8b227..89e6c315906 100644 --- a/mozilla/nsprpub/pr/src/Makefile +++ b/mozilla/nsprpub/pr/src/Makefile @@ -157,7 +157,7 @@ endif ifeq ($(OS_ARCH),WINNT) ifneq ($(OS_TARGET),WIN16) -OS_LIBS = advapi32.lib wsock32.lib winmm.lib +OS_LIBS = advapi32.lib wsock32.lib endif endif diff --git a/mozilla/nsprpub/pr/src/Makefile.in b/mozilla/nsprpub/pr/src/Makefile.in index d6ec23c3f6b..9519718b19e 100644 --- a/mozilla/nsprpub/pr/src/Makefile.in +++ b/mozilla/nsprpub/pr/src/Makefile.in @@ -162,7 +162,7 @@ ifeq ($(OS_TARGET),OS2) # We define this in os2.mk. else ifneq ($(OS_TARGET),WIN16) -OS_LIBS = wsock32.lib winmm.lib +OS_LIBS = advapi32.lib wsock32.lib endif endif endif diff --git a/mozilla/nsprpub/pr/src/md/windows/ntinrval.c b/mozilla/nsprpub/pr/src/md/windows/ntinrval.c index f8d1ec36fe0..d6a3fe6f7cc 100644 --- a/mozilla/nsprpub/pr/src/md/windows/ntinrval.c +++ b/mozilla/nsprpub/pr/src/md/windows/ntinrval.c @@ -88,7 +88,7 @@ _PR_MD_GET_INTERVAL() #elif defined(WIN16) return clock(); /* milliseconds since application start */ #else - return timeGetTime(); /* milliseconds since system start */ + return GetTickCount(); /* milliseconds since system start */ #endif }