Libc-391.5.21.tar.gz

[apple/libc.git] / sys / gettimeofday.c

diff --git a/sys/gettimeofday.c b/sys/gettimeofday.c
index 9b939897428d30bc1c08edeb244713dff45508d7..959bbf5999903c622a642d3c4afd6e654adb2aba 100644 (file)
--- a/sys/gettimeofday.c
+++ b/sys/gettimeofday.c
@@ -1,10 +1,8 @@
 /*
 /*

- * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2003-2005 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 

  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in


@@ -42,32 +40,24 @@
 
 int gettimeofday (struct timeval *tp, struct timezone *tzp)
 {
 
 int gettimeofday (struct timeval *tp, struct timezone *tzp)
 {

+               extern int __gettimeofday(struct timeval *, struct timezone *);
+               extern int __commpage_gettimeofday(struct timeval *);

         static int validtz = 0;
         static struct timezone cached_tz = {0};
         static int validtz = 0;
         static struct timezone cached_tz = {0};

-        struct timeval localtv;
+        struct timeval atv;

   
         if (tp == NULL) {
             if (tzp == NULL)
                 return (0);
   
         if (tp == NULL) {
             if (tzp == NULL)
                 return (0);

-            tp = &localtv;
+            tp = &atv;

         }
 
         }
 

-#if defined(__ppc__) || defined(__ppc64__)
-        {
-            extern int __ppc_gettimeofday(struct timeval *, struct timezone *);
-            extern int __commpage_gettimeofday(struct timeval *);
-    
-            if (__commpage_gettimeofday(tp)) {         /* first try commpage */
-                if (__ppc_gettimeofday(tp,tzp)) {      /* if it fails, use syscall */
-                    return (-1);
-                }
-            }
-        }
-#else
-        if (syscall (SYS_gettimeofday, tp, tzp) < 0) {
-                return (-1);
-        }
-#endif
+               if (__commpage_gettimeofday(tp)) {              /* first try commpage */
+                       if (__gettimeofday(tp, tzp) < 0) {      /* if it fails, use syscall */
+                               return (-1);
+                       }
+               }
+

         if (tzp) {
             if (validtz == 0)  {
                 struct tm *localtm = localtime ((time_t *)&tp->tv_sec);
         if (tzp) {
             if (validtz == 0)  {
                 struct tm *localtm = localtime ((time_t *)&tp->tv_sec);