(x_draw_hollow_cursor): Delay obtaining the frame's DC to avoid

[gnu-emacs] / src / systime.h

diff --git a/src/systime.h b/src/systime.h
index 2f9ace521e2ea7dae3a5acee6a08d1f6076fd2c0..2b7eedbefcd2f870c24ec4dd43a9b9b3406a170e 100644 (file)
--- a/src/systime.h
+++ b/src/systime.h
@@ -18,8 +18,8 @@ along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#ifndef _SYSTIME_H
-#define _SYSTIME_H
+#ifndef EMACS_SYSTIME_H
+#define EMACS_SYSTIME_H
 
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -100,11 +100,16 @@ extern time_t timezone;
 #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)               \
@@ -166,4 +171,4 @@ extern int set_file_times ();
 #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 /* _SYSTIME_H */
+#endif /* EMACS_SYSTIME_H */