Issue #359: Don't duplicate lh_get_hash, just omit the "inline" for VS2010.

diff --git a/linkhash.c b/linkhash.c
index f68ff6f36257aaf313bacccea474119922c1018d..5497061a8a15a11ef637377564470a53f3046ad3 100644 (file)
--- a/linkhash.c
+++ b/linkhash.c
@@ -560,13 +560,6 @@ int lh_table_resize(struct lh_table *t, int new_size)
        return 0;
 }
 
-#if defined(_MSC_VER) && (_MSC_VER < 1900)
-unsigned long lh_get_hash(const struct lh_table *t, const void *k)
-{
-       return t->hash_fn(k);
-}
-#endif
-
 void lh_table_free(struct lh_table *t)
 {
        struct lh_entry *c;

diff --git a/linkhash.h b/linkhash.h
index 9080a72f66f888a4692ba036891699a1223f584a..1493c8086039d7692e64fff572c8976efcafb897 100644 (file)
--- a/linkhash.h
+++ b/linkhash.h
@@ -322,6 +322,13 @@ void lh_abort(const char *msg, ...);
 int lh_table_resize(struct lh_table *t, int new_size);
 
 
+#if !defined(_MSC_VER) || (_MSC_VER > 1800)
+/* VS2010 can't handle inline funcs, so skip it there */
+#define _LH_INLINE inline
+#else
+#define _LH_INLINE
+#endif
+
 /**
  * Calculate the hash of a key for a given table.
  * This is an exension to support functions that need to calculate
@@ -332,19 +339,17 @@ int lh_table_resize(struct lh_table *t, int new_size);
  * @param k a pointer to the key to lookup
  * @return the key's hash
  */
-#if !defined(_MSC_VER) || (_MSC_VER > 1800)
-static inline unsigned long lh_get_hash(const struct lh_table *t, const void *k)\r
-{\r
-       return t->hash_fn(k);\r
+static _LH_INLINE unsigned long lh_get_hash(const struct lh_table *t, const void *k)
+{
+       return t->hash_fn(k);
 }
-#else
-unsigned long lh_get_hash(const struct lh_table *t, const void *k);
-#endif
+
+#undef _LH_INLINE
 
 /* Don't use this outside of linkhash.h: */
 #ifdef __UNCONST
 #define _LH_UNCONST(a) __UNCONST(a)
-#else\r
+#else
 #define _LH_UNCONST(a) ((void *)(uintptr_t)(const void *)(a))
 #endif