Mercurial > emacs
view src/systime.h @ 65342:c71b1b2d2d04
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-530
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 106-111)
- Merge from emacs--cvs-trunk--0
- Update from CVS
2005-09-05 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-tab-body-function): Fixed mismatched custom
type.
* lisp/gnus/gnus.el (gnus-group-change-level-function): Ditto.
* lisp/gnus/gnus-msg.el (gnus-outgoing-message-group): Ditto.
* lisp/gnus/gnus-art.el (gnus-signature-limit)
(gnus-article-mime-part-function): Ditto.
2005-09-04 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/nnweb.el (nnweb-type-definition, nnweb-google-wash-article):
Make fetching article by MID work again for Google Groups. Added
FIXME concerning gnus-group-make-web-group.
* lisp/gnus/mml-smime.el (mml-smime-sign-query, mml-smime-get-dns-cert):
Don't depend on Gnus by using mail-extract-address-components if
gnus-extract-address-components is not bound.
* lisp/gnus/gnus.el (gnus-user-agent): Use list of symbols instead of
symbols. Display full version number for (S)XEmacs. Optionally
display (S)XEmacs codename.
* lisp/gnus/gnus-util.el (gnus-emacs-version): Update for new
`gnus-user-agent'.
* lisp/gnus/gnus-msg.el (gnus-extended-version): Make it possible to omit
Gnus version.
2005-09-02 Hrvoje Niksic <hniksic@xemacs.org>
* lisp/gnus/mm-encode.el (mm-encode-content-transfer-encoding): Likewise
when encoding.
* lisp/gnus/mm-bodies.el (mm-decode-content-transfer-encoding):
De-canonicalize CRLF for all text content types, not just
text/plain.
2005-09-02 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-sum.el (gnus-thread-hide-subtree): Doc fix.
* lisp/gnus/gnus-msg.el (gnus-inews-insert-gcc): Fix the mistake of using
list, not listp.
2005-08-29 Romain Francoise <romain@orebokech.com>
* lisp/gnus/gnus-fun.el (gnus-convert-image-to-face-command): Fix typo in
docstring.
(gnus-face-from-file): Likewise.
2005-08-31 Juanma Barranquero <lekktu@gmail.com>
* lisp/gnus/gnus-art.el (w3m-minor-mode-map):
* lisp/gnus/gnus-spec.el (gnus-newsrc-file-version):
* lisp/gnus/gnus-util.el (nnmail-active-file-coding-system)
(gnus-original-article-buffer, gnus-user-agent):
* lisp/gnus/gnus.el (gnus-ham-process-destinations)
(gnus-parameter-ham-marks-alist)
(gnus-parameter-spam-marks-alist, gnus-spam-autodetect)
(gnus-spam-autodetect-methods, gnus-spam-newsgroup-contents)
(gnus-spam-process-destinations, gnus-spam-process-newsgroups):
* lisp/gnus/mm-decode.el (gnus-current-window-configuration):
* lisp/gnus/mm-extern.el (gnus-article-mime-handles):
* lisp/gnus/mm-url.el (url-current-object, url-package-name)
(url-package-version):
* lisp/gnus/mm-view.el (gnus-article-mime-handles, gnus-newsgroup-charset)
(smime-keys, w3m-cid-retrieve-function-alist)
(w3m-current-buffer, w3m-display-inline-images)
(w3m-minor-mode-map):
* lisp/gnus/mml-smime.el (gnus-extract-address-components):
* lisp/gnus/mml.el (gnus-article-mime-handles, gnus-mouse-2)
(gnus-newsrc-hashtb, message-default-charset)
(message-deletable-headers, message-options)
(message-posting-charset, message-required-mail-headers)
(message-required-news-headers):
* lisp/gnus/mml1991.el (mc-pgp-always-sign):
* lisp/gnus/mml2015.el (mc-pgp-always-sign):
* lisp/gnus/nnheader.el (nnmail-extra-headers):
* lisp/gnus/rfc1843.el (gnus-decode-encoded-word-function)
(gnus-decode-header-function, gnus-newsgroup-name):
* lisp/gnus/spam-stat.el (gnus-original-article-buffer): Add defvars.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 05 Sep 2005 23:58:09 +0000 |
parents | a0d1312ede66 |
children | ad24f42046b1 2d92f5c9d6ae |
line wrap: on
line source
/* systime.h - System-dependent definitions for time manipulations. Copyright (C) 1993, 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef EMACS_SYSTIME_H #define EMACS_SYSTIME_H #ifdef TIME_WITH_SYS_TIME #include <sys/time.h> #include <time.h> #else #ifdef HAVE_SYS_TIME_H #include <sys/time.h> #else #include <time.h> #endif #endif #ifdef HAVE_TZNAME #ifndef tzname /* For SGI. */ extern char *tzname[]; /* RS6000 and others want it this way. */ #endif #endif /* SVr4 doesn't actually declare this in its #include files. */ #ifdef USG5_4 extern time_t timezone; #endif #ifdef VMS #ifdef VAXC #include "vmstime.h" #endif #endif /* On some configurations (hpux8.0, X11R4), sys/time.h and X11/Xos.h disagree about the name of the guard symbol. */ #ifdef HPUX #ifdef _STRUCT_TIMEVAL #ifndef __TIMEVAL__ #define __TIMEVAL__ #endif #endif #endif /* EMACS_TIME is the type to use to represent temporal intervals - struct timeval on some systems, int on others. It can be passed as the timeout argument to the select system call. EMACS_SECS (TIME) is an rvalue for the seconds component of TIME. 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 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. EMACS_GET_TIME (TIME) stores the current system time in TIME, which should be an lvalue. EMACS_ADD_TIME (DEST, SRC1, SRC2) adds SRC1 to SRC2 and stores the result in DEST. SRC should not be negative. EMACS_SUB_TIME (DEST, SRC1, SRC2) subtracts SRC2 from SRC1 and stores the result in DEST. SRC should not be negative. EMACS_TIME_NEG_P (TIME) is true iff TIME is negative. */ #ifdef HAVE_TIMEVAL #define EMACS_HAS_USECS #define EMACS_TIME struct timeval #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, microseconds) ((time).tv_usec = (microseconds)) /* On SVR4, the compiler may complain if given this extra BSD arg. */ #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) \ do { \ (dest).tv_sec = (src1).tv_sec + (src2).tv_sec; \ (dest).tv_usec = (src1).tv_usec + (src2).tv_usec; \ if ((dest).tv_usec > 1000000) \ (dest).tv_usec -= 1000000, (dest).tv_sec++; \ } while (0) #define EMACS_SUB_TIME(dest, src1, src2) \ do { \ (dest).tv_sec = (src1).tv_sec - (src2).tv_sec; \ (dest).tv_usec = (src1).tv_usec - (src2).tv_usec; \ if ((dest).tv_usec < 0) \ (dest).tv_usec += 1000000, (dest).tv_sec--; \ } while (0) #define EMACS_TIME_NEG_P(time) \ ((long)(time).tv_sec < 0 \ || ((time).tv_sec == 0 \ && (long)(time).tv_usec < 0)) #else /* ! defined (HAVE_TIMEVAL) */ #define EMACS_TIME int #define EMACS_SECS(time) (time) #define EMACS_USECS(time) 0 #define EMACS_SET_SECS(time, seconds) ((time) = (seconds)) #define EMACS_SET_USECS(time, usecs) 0 #define EMACS_GET_TIME(t) ((t) = time ((long *) 0)) #define EMACS_ADD_TIME(dest, src1, src2) ((dest) = (src1) + (src2)) #define EMACS_SUB_TIME(dest, src1, src2) ((dest) = (src1) - (src2)) #define EMACS_TIME_NEG_P(t) ((t) < 0) #endif /* ! defined (HAVE_TIMEVAL) */ #define EMACS_SET_SECS_USECS(time, secs, usecs) \ (EMACS_SET_SECS (time, secs), EMACS_SET_USECS (time, usecs)) extern int set_file_times __P ((const char *, EMACS_TIME, EMACS_TIME)); /* Compare times T1 and T2. Value is 0 if T1 and T2 are the same. Value is < 0 if T1 is less than T2. Value is > 0 otherwise. */ #define EMACS_TIME_CMP(T1, T2) \ (EMACS_SECS (T1) - EMACS_SECS (T2) \ + (EMACS_SECS (T1) == EMACS_SECS (T2) \ ? EMACS_USECS (T1) - EMACS_USECS (T2) \ : 0)) /* Compare times T1 and T2 for equality, inequality etc. */ #define EMACS_TIME_EQ(T1, T2) (EMACS_TIME_CMP (T1, T2) == 0) #define EMACS_TIME_NE(T1, T2) (EMACS_TIME_CMP (T1, T2) != 0) #define EMACS_TIME_GT(T1, T2) (EMACS_TIME_CMP (T1, T2) > 0) #define EMACS_TIME_GE(T1, T2) (EMACS_TIME_CMP (T1, T2) >= 0) #define EMACS_TIME_LT(T1, T2) (EMACS_TIME_CMP (T1, T2) < 0) #define EMACS_TIME_LE(T1, T2) (EMACS_TIME_CMP (T1, T2) <= 0) #endif /* EMACS_SYSTIME_H */ /* arch-tag: dcb79915-cf99-4bce-9778-aade71d07651 (do not change this comment) */