summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/adjtime.c
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/unix/sysv/linux/adjtime.c')
-rw-r--r--sysdeps/unix/sysv/linux/adjtime.c41
1 files changed, 7 insertions, 34 deletions
diff --git a/sysdeps/unix/sysv/linux/adjtime.c b/sysdeps/unix/sysv/linux/adjtime.c
index c294ecd6b0..f7dc371fa6 100644
--- a/sysdeps/unix/sysv/linux/adjtime.c
+++ b/sysdeps/unix/sysv/linux/adjtime.c
@@ -24,41 +24,16 @@
 #define MAX_SEC	(INT_MAX / 1000000L - 2)
 #define MIN_SEC	(INT_MIN / 1000000L + 2)
 
-#ifndef MOD_OFFSET
-#define modes mode
-#endif
-
-#ifndef TIMEVAL
-#define TIMEVAL timeval
-#endif
-
-#ifndef TIMEX
-#define TIMEX timex
-#endif
-
-#ifndef ADJTIME
-#define ADJTIME __adjtime
-#endif
-
-#ifndef ADJTIMEX
-#define NO_LOCAL_ADJTIME
-#define ADJTIMEX(x) __adjtimex (x)
-#endif
-
-#ifndef LINKAGE
-#define LINKAGE
-#endif
-
-LINKAGE int
-ADJTIME (itv, otv)
-     const struct TIMEVAL *itv;
-     struct TIMEVAL *otv;
+int
+__adjtime (itv, otv)
+     const struct timeval *itv;
+     struct timeval *otv;
 {
-  struct TIMEX tntx;
+  struct timex tntx;
 
   if (itv)
     {
-      struct TIMEVAL tmp;
+      struct timeval tmp;
 
       /* We will do some check here. */
       tmp.tv_sec = itv->tv_sec + itv->tv_usec / 1000000L;
@@ -74,7 +49,7 @@ ADJTIME (itv, otv)
   else
     tntx.modes = 0;
 
-  if (ADJTIMEX (&tntx) < 0) return -1;
+  if (__adjtimex (&tntx) < 0) return -1;
 
   if (otv)
     {
@@ -92,6 +67,4 @@ ADJTIME (itv, otv)
   return 0;
 }
 
-#ifdef NO_LOCAL_ADJTIME
 weak_alias (__adjtime, adjtime)
-#endif