Mercurial > emacs
comparison src/systime.h @ 90729:6588c6259dfb
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 545-562)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- erc-iswitchb: Temporarily enable iswitchb mode
* gnus--rel--5.10 (patch 172-176)
- Merge from emacs--devo--0
- Update from CVS
- Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-156
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 16 Dec 2006 01:29:26 +0000 |
parents | c5406394f567 132969301815 |
children | 95d0cdf160ea |
comparison
equal
deleted
inserted
replaced
90728:a65a92d83186 | 90729:6588c6259dfb |
---|---|
99 | 99 |
100 /* On SVR4, the compiler may complain if given this extra BSD arg. */ | 100 /* On SVR4, the compiler may complain if given this extra BSD arg. */ |
101 #ifdef GETTIMEOFDAY_ONE_ARGUMENT | 101 #ifdef GETTIMEOFDAY_ONE_ARGUMENT |
102 #define EMACS_GET_TIME(time) gettimeofday (&(time)) | 102 #define EMACS_GET_TIME(time) gettimeofday (&(time)) |
103 #else /* not GETTIMEOFDAY_ONE_ARGUMENT */ | 103 #else /* not GETTIMEOFDAY_ONE_ARGUMENT */ |
104 #ifdef HAVE_STRUCT_TIMEZONE | |
105 #define EMACS_GET_TIME(time) \ | |
106 do { \ | |
107 struct timezone dummy; \ | |
108 gettimeofday (&(time), &dummy); \ | |
109 } while (0) | |
110 #else | |
111 /* Presumably the second arg is ignored. */ | 104 /* Presumably the second arg is ignored. */ |
112 #define EMACS_GET_TIME(time) gettimeofday (&(time), NULL) | 105 #define EMACS_GET_TIME(time) gettimeofday (&(time), NULL) |
113 #endif /* HAVE_STRUCT_TIMEZONE */ | |
114 #endif /* not GETTIMEOFDAY_ONE_ARGUMENT */ | 106 #endif /* not GETTIMEOFDAY_ONE_ARGUMENT */ |
115 | 107 |
116 #define EMACS_ADD_TIME(dest, src1, src2) \ | 108 #define EMACS_ADD_TIME(dest, src1, src2) \ |
117 do { \ | 109 do { \ |
118 (dest).tv_sec = (src1).tv_sec + (src2).tv_sec; \ | 110 (dest).tv_sec = (src1).tv_sec + (src2).tv_sec; \ |