]> git.ipfire.org Git - thirdparty/open-vm-tools.git/commitdiff
Fix HgfsConvertFromNtTimeNsec() for arm-linux builds.
authorVMware, Inc <>
Mon, 21 May 2012 22:28:33 +0000 (15:28 -0700)
committerDmitry Torokhov <dtor@vmware.com>
Tue, 22 May 2012 18:57:14 +0000 (11:57 -0700)
ARM isn't just Android and iOS...

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
open-vm-tools/lib/hgfs/hgfsUtil.c

index c2f8a88c07480e13424c0a0035ccb664f75be6d5..e43027562fdd274a096eb781fe54fcca3b2655f0 100644 (file)
 #include "hgfsUtil.h"
 #include "vmware.h"
 #include "vm_basic_asm.h"
-#ifdef __APPLE__
-#include <TargetConditionals.h>
-#ifndef TARGET_OS_IPHONE
-#define TARGET_OS_IPHONE 0
-#endif
-#endif
 
 #ifndef _WIN32
 /*
@@ -115,7 +109,7 @@ int
 HgfsConvertFromNtTimeNsec(struct timespec *unixTime, // OUT: Time in UNIX format
                          uint64 ntTime) // IN: Time in Windows NT format
 {
-#if !defined(VM_X86_64) && !defined(__ANDROID__) && !TARGET_OS_IPHONE
+#if !defined(VM_X86_64) && !defined(__arm__)
    uint32 sec;
    uint32 nsec;
 
@@ -140,7 +134,7 @@ HgfsConvertFromNtTimeNsec(struct timespec *unixTime, // OUT: Time in UNIX format
       return -1;
    }
 
-#if !defined(VM_X86_64) && !defined(__ANDROID__) && !TARGET_OS_IPHONE
+#if !defined(VM_X86_64) && !defined(__arm__)
    Div643232(ntTime - UNIX_EPOCH, 10000000, &sec, &nsec);
    unixTime->tv_sec = sec;
    unixTime->tv_nsec = nsec * 100;