about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/clock_gettime.c2
-rw-r--r--sysdeps/unix/sysv/linux/clock_gettime.c14
3 files changed, 13 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 145c38bf56..8612676e7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-11-12  Ulrich Drepper  <drepper@gmail.com>
 
+	* sysdeps/unix/clock_gettime.c (clock_gettime): No need to assign
+	result of SYSDEP_GETTIME_CPU to retval.
+	* sysdeps/unix/sysv/linux/clock_gettime.c (SYSDEP_GETTIME_CPU): Add
+	parameter list to macro.  Remove trailing semicolon.  Adjust users.
+
 	* resolv/getaddrinfo_a.c (getaddrinfo_a): Avoid warning about unused
 	variable.
 
diff --git a/sysdeps/unix/clock_gettime.c b/sysdeps/unix/clock_gettime.c
index d467f2b787..b4355d4638 100644
--- a/sysdeps/unix/clock_gettime.c
+++ b/sysdeps/unix/clock_gettime.c
@@ -113,7 +113,7 @@ clock_gettime (clockid_t clock_id, struct timespec *tp)
 
     default:
 #ifdef SYSDEP_GETTIME_CPU
-      retval = SYSDEP_GETTIME_CPU (clock_id, tp);
+      SYSDEP_GETTIME_CPU (clock_id, tp);
 #endif
 #if HP_TIMING_AVAIL
       if ((clock_id & ((1 << CLOCK_IDFIELD_SIZE) - 1))
diff --git a/sysdeps/unix/sysv/linux/clock_gettime.c b/sysdeps/unix/sysv/linux/clock_gettime.c
index 0ae45de371..e5e032d98b 100644
--- a/sysdeps/unix/sysv/linux/clock_gettime.c
+++ b/sysdeps/unix/sysv/linux/clock_gettime.c
@@ -45,8 +45,8 @@
 
 /* This means the REALTIME and MONOTONIC clock are definitely
    supported in the kernel.  */
-# define SYSDEP_GETTIME							      \
-  SYSDEP_GETTIME_CPUTIME						      \
+# define SYSDEP_GETTIME \
+  SYSDEP_GETTIME_CPUTIME;						      \
   case CLOCK_REALTIME:							      \
   case CLOCK_MONOTONIC:							      \
     retval = SYSCALL_GETTIME (clock_id, tp);				      \
@@ -82,8 +82,8 @@ maybe_syscall_gettime (clockid_t clock_id, struct timespec *tp)
 
 /* The REALTIME and MONOTONIC clock might be available.  Try the
    syscall first.  */
-# define SYSDEP_GETTIME							      \
-  SYSDEP_GETTIME_CPUTIME						      \
+# define SYSDEP_GETTIME \
+  SYSDEP_GETTIME_CPUTIME;						      \
   case CLOCK_REALTIME:							      \
   case CLOCK_MONOTONIC:							      \
   case CLOCK_MONOTONIC_RAW:						      \
@@ -100,7 +100,7 @@ maybe_syscall_gettime (clockid_t clock_id, struct timespec *tp)
 	__set_errno (retval);						      \
 	retval = -1;							      \
       }									      \
-    break;
+    break
 #endif
 
 #ifdef __NR_clock_gettime
@@ -164,7 +164,7 @@ maybe_syscall_gettime_cpu (clockid_t clock_id, struct timespec *tp)
   return e;
 }
 
-#  define SYSDEP_GETTIME_CPU						      \
+#  define SYSDEP_GETTIME_CPU(clock_id, tp) \
   retval = maybe_syscall_gettime_cpu (clock_id, tp);			      \
   if (retval == 0)							      \
     break;								      \
@@ -199,7 +199,7 @@ maybe_syscall_gettime_cputime (clockid_t clock_id, struct timespec *tp)
 	  break;							      \
 	}								      \
       retval = hp_timing_gettime (clock_id, tp);			      \
-      break;
+      break
 #  if !HP_TIMING_AVAIL
 #   define hp_timing_gettime(clock_id, tp) (__set_errno (EINVAL), -1)
 #  endif