From: VMware, Inc <>
Date: Mon, 26 Jul 2010 18:42:31 +0000 (-0700)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2010.07.25-280253~64
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ce11f47cd26b577f441d15718bdb6cc0345df2a;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/dynarray.h b/open-vm-tools/lib/include/dynarray.h
index 868ccf0ca..ee79c769d 100644
--- a/open-vm-tools/lib/include/dynarray.h
+++ b/open-vm-tools/lib/include/dynarray.h
@@ -256,10 +256,16 @@ DynArray_Copy(DynArray *src,        // IN
 #define DEFINE_DYNARRAY_TYPE(T)     DEFINE_DYNARRAY_NAMED_TYPE(T, T)
 
 #define DEFINE_DYNARRAY_NAMED_TYPE(T, TYPE)                             \
+   DECLARE_DYNARRAY_TYPE(T)                                             \
+   DEFINEONLY_DYNARRAY_NAMED_TYPE(T, TYPE)
+
+#define DECLARE_DYNARRAY_TYPE(T)                                        \
+   typedef DynArray T##Array;
+
+#define DEFINEONLY_DYNARRAY_NAMED_TYPE(T, TYPE)                         \
                                                                         \
    typedef int (CDECLCONV *DynArray##T##Cmp)(const TYPE *,              \
                                              const TYPE *);             \
-   typedef DynArray T##Array;                                           \
                                                                         \
    static INLINE Bool                                                   \
    T##Array_Init(T##Array *a, unsigned int count)                       \