From: VMware, Inc <>
Date: Mon, 21 May 2012 22:28:33 +0000 (-0700)
Subject: Fix HgfsConvertFromNtTimeNsec() for arm-linux builds.
X-Git-Tag: 2012.05.21-724730~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85a42b14e8dfc15f1e012109a0d9fee8a5c8278a;p=thirdparty%2Fopen-vm-tools.git

Fix HgfsConvertFromNtTimeNsec() for arm-linux builds.

ARM isn't just Android and iOS...

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
---

diff --git a/open-vm-tools/lib/hgfs/hgfsUtil.c b/open-vm-tools/lib/hgfs/hgfsUtil.c
index c2f8a88c0..e43027562 100644
--- a/open-vm-tools/lib/hgfs/hgfsUtil.c
+++ b/open-vm-tools/lib/hgfs/hgfsUtil.c
@@ -47,12 +47,6 @@
 #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;