summaryrefslogtreecommitdiff
path: root/src/systime.h
diff options
context:
space:
mode:
authorJim Blandy <jimb@redhat.com>1993-05-04 02:36:45 +0000
committerJim Blandy <jimb@redhat.com>1993-05-04 02:36:45 +0000
commit7f86bdacd5c76cd2a25321bba9e744c05cd584bf (patch)
treea4704b964eda4edbf14b64f8a782ddb9c10fa901 /src/systime.h
parent68936329c2d560a52f59cecfd898a61613380213 (diff)
downloademacs-7f86bdacd5c76cd2a25321bba9e744c05cd584bf.tar.gz
* systime.h: Doc fix.
(EMACS_SET_USECS): Remember that a `usec' is a microsecond, not a millisecond. What's three orders of magnitude between friends? * dispnew.c (Fsit_for, Fsleep_for): Remember to multiply the `milliseconds' argument by 1000 to get microseconds. Changes for Emacs 19 from Thorsten Ohl <ohl@chico.harvard.edu>: * s/mach2.h: copied from the Emacs 18.59 distribution. Don't define NO_REMAP, define START_FILES as `pre-crt0.o' instead. Define LIB_MATH as `-lm', to override the default `-lm -lc' (there is no libc on the NeXT). * ymakefile (STARTFILES): Allow config.h to set this value even if ORDINARY_LINK is defined. * unexnext.c: Fix subdirectories for the machine dependent include files for NeXTStep 3.0; #include <mach/mach.h> and <mach-o/loader.h> instead of <mach.h> and <sys/loader.h>. (getsectbyname): Remove prototype for this; the system #include files take care of that. (malloc_cookie): New variable. (unexec_doit): Set malloc_cookie to the result returned by malloc_freezedry. * emacs.c (main): Declare malloc_cookie to be extern, so that we can get the value set when we dumped and pass it to malloc_jumpstart. * systime.h: The NeXT has a timezone function.
Diffstat (limited to 'src/systime.h')
-rw-r--r--src/systime.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/systime.h b/src/systime.h
index 285d9984365..094aee2a249 100644
--- a/src/systime.h
+++ b/src/systime.h
@@ -60,10 +60,10 @@ extern long timezone;
EMACS_SET_SECS (TIME, SECONDS) sets that to SECONDS.
EMACS_HAS_USECS is defined iff EMACS_TIME has a usecs component.
- EMACS_USECS (TIME) is an rvalue for the milliseconds component of TIME.
- This returns zero if EMACS_TIME doesn't have a milliseconds component.
- EMACS_SET_USECS (TIME, MILLISECONDS) sets that to MILLISECONDS.
- This does nothing if EMACS_TIME doesn't have a milliseconds component.
+ EMACS_USECS (TIME) is an rvalue for the microseconds component of TIME.
+ This returns zero if EMACS_TIME doesn't have a microseconds component.
+ EMACS_SET_USECS (TIME, MICROSECONDS) sets that to MICROSECONDS.
+ This does nothing if EMACS_TIME doesn't have a microseconds component.
EMACS_SET_SECS_USECS (TIME, SECS, USECS) sets both components of TIME.
@@ -90,7 +90,7 @@ extern long timezone;
#define EMACS_SECS(time) ((time).tv_sec + 0)
#define EMACS_USECS(time) ((time).tv_usec + 0)
#define EMACS_SET_SECS(time, seconds) ((time).tv_sec = (seconds))
-#define EMACS_SET_USECS(time, milliseconds) ((time).tv_usec = (milliseconds))
+#define EMACS_SET_USECS(time, microseconds) ((time).tv_usec = (microseconds))
#define EMACS_GET_TIME(time) \
{ \
@@ -233,7 +233,7 @@ extern long timezone;
#else /* ! defined (ultrix) || defined (hpux) || defined (_AIX) */
/* If we are running SunOS, Mt. Xinu BSD, or MACH 2.5, these systems have a
timezone function. */
-#if (defined (hp9000) && ! defined (hpux) && defined (unix)) || defined (MACH) || defined (sun)
+#if (defined (hp9000) && ! defined (hpux) && defined (unix)) || defined (MACH) || defined (sun) || defined (NeXT)
#define EMACS_GET_TZ_NAMES(standard, savings) \
do { \