aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDave Love2000-06-05 14:34:08 +0000
committerDave Love2000-06-05 14:34:08 +0000
commit482fa0533f57a1f5050e0633f65cc08fa5ddbe15 (patch)
treeef9764db378336fcc37da44fb5af48ccc8b2f09d /src
parentedc8940c14ab6d35548349fc1452c2036156f8bf (diff)
downloademacs-482fa0533f57a1f5050e0633f65cc08fa5ddbe15.tar.gz
emacs-482fa0533f57a1f5050e0633f65cc08fa5ddbe15.zip
Protect against multiple inclusion.
(timezone) [USG5_4]: Define as time_t.
Diffstat (limited to 'src')
-rw-r--r--src/systime.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/systime.h b/src/systime.h
index 7ded857da7e..2f9ace521e2 100644
--- a/src/systime.h
+++ b/src/systime.h
@@ -18,6 +18,9 @@ along with GNU Emacs; see the file COPYING. If not, write to
18the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 18the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
19Boston, MA 02111-1307, USA. */ 19Boston, MA 02111-1307, USA. */
20 20
21#ifndef _SYSTIME_H
22#define _SYSTIME_H
23
21#ifdef TIME_WITH_SYS_TIME 24#ifdef TIME_WITH_SYS_TIME
22#include <sys/time.h> 25#include <sys/time.h>
23#include <time.h> 26#include <time.h>
@@ -37,7 +40,7 @@ extern char *tzname[]; /* RS6000 and others want it this way. */
37 40
38/* SVr4 doesn't actually declare this in its #include files. */ 41/* SVr4 doesn't actually declare this in its #include files. */
39#ifdef USG5_4 42#ifdef USG5_4
40extern long timezone; 43extern time_t timezone;
41#endif 44#endif
42 45
43#ifdef VMS 46#ifdef VMS
@@ -163,3 +166,4 @@ extern int set_file_times ();
163#define EMACS_TIME_LT(T1, T2) (EMACS_TIME_CMP (T1, T2) < 0) 166#define EMACS_TIME_LT(T1, T2) (EMACS_TIME_CMP (T1, T2) < 0)
164#define EMACS_TIME_LE(T1, T2) (EMACS_TIME_CMP (T1, T2) <= 0) 167#define EMACS_TIME_LE(T1, T2) (EMACS_TIME_CMP (T1, T2) <= 0)
165 168
169#endif /* _SYSTIME_H */