(shell-command-on-region): Doc fix.

[bpt/emacs.git] / src / systime.h

diff --git a/src/systime.h b/src/systime.h
index 71e238e..44c1f7d 100644 (file)
--- a/src/systime.h
+++ b/src/systime.h
@@ -1,11 +1,11 @@
 /* systime.h - System-dependent definitions for time manipulations.
-   Copyright (C) 1993 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994 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 1, or (at your option)
+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,
@@ -15,7 +15,8 @@ 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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -45,6 +46,15 @@ extern long timezone;
 #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
 \f
 /* EMACS_TIME is the type to use to represent temporal intervals -
    struct timeval on some systems, int on others.  It can be passed as
@@ -63,9 +73,6 @@ extern long timezone;
 
    EMACS_GET_TIME (TIME) stores the current system time in TIME, which
        should be an lvalue.
-   EMACS_SET_UTIMES (PATH, ATIME, MTIME) changes the last-access and
-       last-modification times of the file named PATH to ATIME and
-       MTIME, which are EMACS_TIMEs.
 
    EMACS_ADD_TIME (DEST, SRC1, SRC2) adds SRC1 to SRC2 and stores the
        result in DEST.  SRC should not be negative.
@@ -87,18 +94,18 @@ extern long timezone;
 #define EMACS_SET_USECS(time, microseconds) ((time).tv_usec = (microseconds))
 
 /* On SVR4, the compiler may complain if given this extra BSD arg.  */
-#ifdef USG5_4
+#ifdef GETTIMEOFDAY_ONE_ARGUMENT
 #define EMACS_GET_TIME(time)                                  \
 {                                                             \
   gettimeofday (&(time));                                     \
 }
-#else /* not USG5_4 */
+#else /* not GETTIMEOFDAY_ONE_ARGUMENT */
 #define EMACS_GET_TIME(time)                                   \
 {                                                              \
   struct timezone dummy;                                       \
   gettimeofday (&(time), &dummy);                              \
 }
-#endif /* not USG5_4 */
+#endif /* not GETTIMEOFDAY_ONE_ARGUMENT */
 
 #define EMACS_ADD_TIME(dest, src1, src2)                       \
 {                                                              \
@@ -139,24 +146,4 @@ extern long timezone;
 #define EMACS_SET_SECS_USECS(time, secs, usecs)                \
   (EMACS_SET_SECS (time, secs), EMACS_SET_USECS (time, usecs))
 
-#ifdef USE_UTIME
-
-#define EMACS_SET_UTIMES(path, atime, mtime)                   \
-  {                                                            \
-    time_t tv[2];                                              \
-    tv[0] = EMACS_SECS (atime);                                        \
-    tv[1] = EMACS_SECS (mtime);                                        \
-    utime ((path), tv);                                                \
-  }
-
-#else /* ! defined (USE_UTIME) */
-
-#define EMACS_SET_UTIMES(path, atime, mtime)                   \
-  {                                                            \
-    EMACS_TIME tv[2];                                          \
-    tv[0] = atime;                                             \
-    tv[1] = mtime;                                             \
-    utimes ((path), tv);                                       \
-  }
-
-#endif /* ! defined (USE_UTIME) */
+extern int set_file_times ();