-#ifdef USG5_4
-#define EMACS_GET_TIME(time) \
-{ \
- gettimeofday (&(time)); \
-}
-#else /* not USG5_4 */
-#define EMACS_GET_TIME(time) \
-{ \
- struct timezone dummy; \
- gettimeofday (&(time), &dummy); \
-}
-#endif /* not USG5_4 */
-
-#define EMACS_ADD_TIME(dest, src1, src2) \
-{ \
- (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++; \
-}
-
-#define EMACS_SUB_TIME(dest, src1, src2) \
-{ \
- (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--; \
-}
+#ifdef GETTIMEOFDAY_ONE_ARGUMENT
+#define EMACS_GET_TIME(time) gettimeofday (&(time))
+#else /* not GETTIMEOFDAY_ONE_ARGUMENT */
+/* Presumably the second arg is ignored. */
+#define EMACS_GET_TIME(time) gettimeofday (&(time), NULL)
+#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)