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

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

diff --git a/open-vm-tools/lib/include/util.h b/open-vm-tools/lib/include/util.h
index 7460b2abd09ff2d6ea4d228211ff7157bd93d48e..a9539c2766898ef6f42966ff228d09848220061e 100644 (file)
--- a/open-vm-tools/lib/include/util.h
+++ b/open-vm-tools/lib/include/util.h
@@ -152,6 +152,7 @@ Bool Util_QueryCStResidency(uint32 *numCpus, uint32 *numCStates,
 /*
  * In util_shared.h
  */
+#define UTIL_FASTRAND_SEED_MAX (0x7fffffff)
 Bool Util_Throttle(uint32 count);
 uint32 Util_FastRand(uint32 seed);
 

diff --git a/open-vm-tools/lib/include/util_shared.h b/open-vm-tools/lib/include/util_shared.h
index ded2262e025bdc99683a4162af6e49c5a7932f6a..e669683d027d8b4d21f5cc7c8c747f8601c5094c 100644 (file)
--- a/open-vm-tools/lib/include/util_shared.h
+++ b/open-vm-tools/lib/include/util_shared.h
@@ -80,8 +80,6 @@ Util_Throttle(uint32 count)  // IN:
  *----------------------------------------------------------------------
  */
 
-#define UTIL_FASTRAND_SEED_MAX (0x7fffffff)
-
 uint32
 Util_FastRand(uint32 seed)
 {

diff --git a/open-vm-tools/lib/include/vm_basic_types.h b/open-vm-tools/lib/include/vm_basic_types.h
index 24e29191e5514ead7318530290725b4a0e1351d9..53b681d6743e1f8f1ba3b0bd9fc9b1fd6ee87587 100644 (file)
--- a/open-vm-tools/lib/include/vm_basic_types.h
+++ b/open-vm-tools/lib/include/vm_basic_types.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2009 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2012 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -707,6 +707,19 @@ typedef void * UserVA;
 #define SIDE_EFFECT_FREE
 #endif
 
+/*
+ * Used when a function exmaines no input other than its arguments and
+ * has no side effects other than its return value.  Stronger than
+ * SIDE_EFFECT_FREE as the function is not allowed to read from global
+ * memory.
+ */
+
+#if defined(__GNUC__) && (defined(VMM) || defined (VMKERNEL))
+#define CONST_FUNCTION __attribute__((__const__))
+#else
+#define CONST_FUNCTION
+#endif
+
 /*
  * Attributes placed on function declarations to tell the compiler
  * that the function never returns.