diff options
| author | wtc%netscape.com <devnull@localhost> | 2000-09-21 05:28:43 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2000-09-21 05:28:43 +0000 |
| commit | 9b1718d8acac068c9bed8892379dbcc6310b8de5 (patch) | |
| tree | cff6a289d3c5e4e308a381634ae85e40a7e86b2d | |
| parent | 3c9d41c78099adf65796d59f13ccb6a655258de9 (diff) | |
| download | nspr-hg-9b1718d8acac068c9bed8892379dbcc6310b8de5.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_RELEASE_4_0_BRANCH)
| -rw-r--r-- | pr/src/Makefile | 2 | ||||
| -rw-r--r-- | pr/src/Makefile.in | 2 | ||||
| -rw-r--r-- | pr/src/md/windows/ntinrval.c | 2 |
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 } |