summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES3
-rwxr-xr-xNt/386/include/lib9.h1
-rw-r--r--emu/Nt/ie-os.c19
-rw-r--r--emu/Nt/os.c13
4 files changed, 9 insertions, 27 deletions
diff --git a/CHANGES b/CHANGES
index 25e2db41..1cd99ad9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+20080131
+ update emu/Nt/^(os.c ie-os.c ie-win.c ie emu), but properly this time [issue 81]
+ remove _USE_32BIT_TIME_T from Nt/386/include/lib9.h, and time() def'n from emu/Nt/*.c [issue 81]
20080130
failed to return nil from Jvalue.get in appl/lib/json.b if member name didn't match
similar problem in appl/lib/ubfa.b
diff --git a/Nt/386/include/lib9.h b/Nt/386/include/lib9.h
index 4f66302a..4bbb8e5d 100755
--- a/Nt/386/include/lib9.h
+++ b/Nt/386/include/lib9.h
@@ -1,5 +1,4 @@
#define _POSIX_SOURCE
-#define _USE_32BIT_TIME_T
#include <stdlib.h>
#include <stdarg.h>
#include <errno.h>
diff --git a/emu/Nt/ie-os.c b/emu/Nt/ie-os.c
index 20641a95..39898d0f 100644
--- a/emu/Nt/ie-os.c
+++ b/emu/Nt/ie-os.c
@@ -696,19 +696,6 @@ tm2sec(SYSTEMTIME *tm)
return secs;
}
-long
-time(long *tp)
-{
- SYSTEMTIME tm;
- long t;
-
- GetSystemTime(&tm);
- t = tm2sec(&tm);
- if(tp != nil)
- *tp = t;
- return t;
-}
-
/*
* Return the time since the epoch in microseconds
* The epoch is defined at 1 Jan 1970
@@ -724,6 +711,12 @@ osusectime(void)
return secs * 1000000 + tm.wMilliseconds * 1000;
}
+vlong
+osnsec(void)
+{
+ return osusectime()*1000; /* TO DO better */
+}
+
int
osmillisleep(ulong milsec)
{
diff --git a/emu/Nt/os.c b/emu/Nt/os.c
index 3f7156d9..e3d2c663 100644
--- a/emu/Nt/os.c
+++ b/emu/Nt/os.c
@@ -645,19 +645,6 @@ tm2sec(SYSTEMTIME *tm)
return secs;
}
-long
-time(long *tp)
-{
- SYSTEMTIME tm;
- long t;
-
- GetSystemTime(&tm);
- t = tm2sec(&tm);
- if(tp != nil)
- *tp = t;
- return t;
-}
-
/*
* Return the time since the epoch in microseconds
* The epoch is defined at 1 Jan 1970