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 70e588918bb68c29e2bd4b359b7269d6fec73f67..3f4f1e7abef0e48ff501725b15b14154ec389c85 100644 (file)
--- a/open-vm-tools/lib/include/vm_basic_types.h
+++ b/open-vm-tools/lib/include/vm_basic_types.h
@@ -678,13 +678,16 @@ typedef void * UserVA;
 #if defined __GNUC__
 /*
  * Starting at version 3.3, gcc does not always inline functions marked
- * 'inline' (it depends on their size). To force gcc to do so, one must use the
- * extra __always_inline__ attribute.
+ * 'inline' (it depends on their size and other factors). To force gcc
+ * to inline a function, one must use the __always_inline__ attribute.
+ * This attribute should be used sparingly and with care.  It is usually
+ * preferable to let gcc make its own inlining decisions
  */
-#   define INLINE_SINGLE_CALLER INLINE __attribute__((__always_inline__))
+#   define INLINE_ALWAYS INLINE __attribute__((__always_inline__))
 #else
-#   define INLINE_SINGLE_CALLER INLINE
+#   define INLINE_ALWAYS INLINE
 #endif
+#define INLINE_SINGLE_CALLER INLINE_ALWAYS
 
 /*
  * Used when a hard guaranteed of no inlining is needed. Very few