Mercurial > emacs
diff 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 |
line wrap: on
line diff
--- a/src/systime.h Fri Dec 15 01:34:17 2006 +0000 +++ b/src/systime.h Sat Dec 16 01:29:26 2006 +0000 @@ -101,16 +101,8 @@ #ifdef GETTIMEOFDAY_ONE_ARGUMENT #define EMACS_GET_TIME(time) gettimeofday (&(time)) #else /* not GETTIMEOFDAY_ONE_ARGUMENT */ -#ifdef HAVE_STRUCT_TIMEZONE -#define EMACS_GET_TIME(time) \ - do { \ - struct timezone dummy; \ - gettimeofday (&(time), &dummy); \ - } while (0) -#else /* Presumably the second arg is ignored. */ #define EMACS_GET_TIME(time) gettimeofday (&(time), NULL) -#endif /* HAVE_STRUCT_TIMEZONE */ #endif /* not GETTIMEOFDAY_ONE_ARGUMENT */ #define EMACS_ADD_TIME(dest, src1, src2) \