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 d5b1224b64a08315b7d910c3362e09d2559aed23..efe559390b8d2e3d8f964c6cb294cfa8ecb397cd 100644 (file)
--- 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 b950cf84b031fcb6ea5d3fd9d9c37702c5f77676..1e5f6b7927e4c4386eb32c66fe82c5124f42cbd8 100644 (file)
--- 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"