From: VMware, Inc <>
Date: Mon, 26 Jul 2010 18:19:38 +0000 (-0700)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2010.07.25-280253~90
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=820e2e929797e607f94e850d916f8e84d4df2850;p=thirdparty%2Fopen-vm-tools.git

Changes in shared code that don't affect open-vm-tools functionality.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/lib/include/vm_basic_types.h b/open-vm-tools/lib/include/vm_basic_types.h
index a2d5f9083..031f59b00 100644
--- a/open-vm-tools/lib/include/vm_basic_types.h
+++ b/open-vm-tools/lib/include/vm_basic_types.h
@@ -308,7 +308,11 @@ typedef int64 VmTimeVirtualClock;  /* Virtual Clock kept in CPU cycles */
 #elif defined __APPLE__
    /* Mac OS hosts use the same formatters for 32- and 64-bit. */
    #define FMT64 "ll"
-   #define FMTSZ "z"
+   #if KERNEL
+      #define FMTSZ "l"
+   #else
+      #define FMTSZ "z"
+   #endif
    #define FMTPD "l"
    #define FMTH ""
 #elif __GNUC__