summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtc%netscape.com <devnull@localhost>2000-09-21 05:27:24 +0000
committerwtc%netscape.com <devnull@localhost>2000-09-21 05:27:24 +0000
commit531ee6c2231b92e9af6551a97cf55db1e7449f3e (patch)
tree754a0619cb8d046ece8d337f652168e747cdfc70
parent8b6d181acae64398b3fce229bec48e12dc56ed37 (diff)
downloadnspr-hg-531ee6c2231b92e9af6551a97cf55db1e7449f3e.tar.gz
Bugzilla bug #42714: removed dependency on winmm.dll. Replaced
timeGetTime() with GetTickCount(). Modified files: pr/src/Makefile, pr/src/Makefile.in, ntinrval.c (NSPRPUB_CLIENT_BRANCH) r=larryh@netscape.com. a=rickg@netscape.com, brendan@mozilla.org.
-rw-r--r--pr/src/Makefile2
-rw-r--r--pr/src/Makefile.in2
-rw-r--r--pr/src/md/windows/ntinrval.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/pr/src/Makefile b/pr/src/Makefile
index d608681d..89943d3b 100644
--- a/pr/src/Makefile
+++ b/pr/src/Makefile
@@ -141,7 +141,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/pr/src/Makefile.in b/pr/src/Makefile.in
index 2458b896..3e85803b 100644
--- a/pr/src/Makefile.in
+++ b/pr/src/Makefile.in
@@ -146,7 +146,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/pr/src/md/windows/ntinrval.c b/pr/src/md/windows/ntinrval.c
index ba5e1e8e..ea67302d 100644
--- a/pr/src/md/windows/ntinrval.c
+++ b/pr/src/md/windows/ntinrval.c
@@ -72,7 +72,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
}