(EMACS_GET_TIME, EMACS_ADD_TIME, EMACS_SUB_TIME): Give

macros statement form.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5465c6eda89605e6cf9e41c46d7a58d876769dec..532436c95bf960b3ce80516d8b8679393ec50a57 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2000-01-04  Gerd Moellmann  <gerd@gnu.org>
 
+       * systime.h (EMACS_GET_TIME, EMACS_ADD_TIME, EMACS_SUB_TIME): Give
+       macros statement form.
+
        * sound.c (struct sound): Renamed from struct sound_file.
        (struct sound): Add members `data' and `header_size'.
        (enum sound_attr): Add SOUND_DATA.

diff --git a/src/systime.h b/src/systime.h
index a94dc3ed3539020c039984a8a2a1b0dd9d1e8185..7ded857da7e3427dad1b233fdd53514d30e93043 100644 (file)
--- a/src/systime.h
+++ b/src/systime.h
@@ -95,33 +95,30 @@ extern long timezone;
 
 /* On SVR4, the compiler may complain if given this extra BSD arg.  */
 #ifdef GETTIMEOFDAY_ONE_ARGUMENT
-#define EMACS_GET_TIME(time)                                  \
-{                                                             \
-  gettimeofday (&(time));                                     \
-}
+#define EMACS_GET_TIME(time) gettimeofday (&(time))
 #else /* not GETTIMEOFDAY_ONE_ARGUMENT */
-#define EMACS_GET_TIME(time)                                   \
-{                                                              \
-  struct timezone dummy;                                       \
-  gettimeofday (&(time), &dummy);                              \
-}
+#define EMACS_GET_TIME(time)                   \
+  do {                                         \
+    struct timezone dummy;                     \
+    gettimeofday (&(time), &dummy);            \
+  } while (0)
 #endif /* not GETTIMEOFDAY_ONE_ARGUMENT */
 
-#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--;                        \
-}
+#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                                     \