From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 27 Jul 2018 18:46:22 +0000 (-0700)
Subject: Changes to common source files; not applicable to open-vm-tools.
X-Git-Tag: stable-11.0.0~498
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9a723a05033fbf1405316c8e0ee7e753058fcb0;p=thirdparty%2Fopen-vm-tools.git

Changes to common source files; not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/file/fileInt.h b/open-vm-tools/lib/file/fileInt.h
index d5b1224b6..efe559390 100644
--- a/open-vm-tools/lib/file/fileInt.h
+++ b/open-vm-tools/lib/file/fileInt.h
@@ -46,7 +46,8 @@
  * So they make sense only for Linux build. If you need them on other OSes,
  * think once more.
  */
-
+#define HFSPLUS_SUPER_MAGIC   0x482B
+#if !defined(__ANDROID__)
 #define ADFS_SUPER_MAGIC      0xadf5
 #define AFFS_SUPER_MAGIC      0xADFF
 #define EXT_SUPER_MAGIC       0x137D
@@ -54,7 +55,6 @@
 #define EXT2_SUPER_MAGIC      0xEF53
 #define EXT3_SUPER_MAGIC      0xEF53
 #define EXT4_SUPER_MAGIC      0xEF53
-#define HFSPLUS_SUPER_MAGIC   0x482B
 #define NFS_SUPER_MAGIC       0x6969
 #define SMB_SUPER_MAGIC       0x517B
 #define ISOFS_SUPER_MAGIC     0x9660
@@ -63,6 +63,7 @@
 #define OPENPROM_SUPER_MAGIC  0x9fa1
 #define USBDEVICE_SUPER_MAGIC 0x9fa2
 #define AUTOFS_SUPER_MAGIC    0x0187
+#endif
 
 #if !defined(MSDOS_SUPER_MAGIC)
 #define MSDOS_SUPER_MAGIC     0x4D44
diff --git a/open-vm-tools/lib/misc/idLinux.c b/open-vm-tools/lib/misc/idLinux.c
index b950cf84b..1e5f6b792 100644
--- a/open-vm-tools/lib/misc/idLinux.c
+++ b/open-vm-tools/lib/misc/idLinux.c
@@ -45,7 +45,7 @@
 #endif
 #endif
 #if defined __ANDROID__
-#include <syscall-android.h>
+#include <bits/glibc-syscalls.h>
 #endif
 
 #include "vmware.h"