mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-03-13 18:19:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

if compile with vs2015, enable the "static inline" declare.

Browse Source
This commit is contained in:
Haffon
2017-09-07 10:28:26 +08:00
parent b301f4ea01
commit e9f9f14f22
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
linkhash.c
View File

@@ -560,10 +560,12 @@ int lh_table_resize(struct lh_table *t, int new_size)
return 0; return 0;
} }
#if defined(_MSC_VER) && (_MSC_VER < 1900)
unsigned long lh_get_hash(const struct lh_table *t, const void *k) unsigned long lh_get_hash(const struct lh_table *t, const void *k)
{ {
return t->hash_fn(k); return t->hash_fn(k);
} }
#endif
void lh_table_free(struct lh_table *t) void lh_table_free(struct lh_table *t)
{ {

7
linkhash.h
View File

@@ -332,7 +332,14 @@ int lh_table_resize(struct lh_table *t, int new_size);
* @param k a pointer to the key to lookup * @param k a pointer to the key to lookup
* @return the key's hash * @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)
{
return t->hash_fn(k);
}
#else
unsigned long lh_get_hash(const struct lh_table *t, const void *k); unsigned long lh_get_hash(const struct lh_table *t, const void *k);
#endif
/* Don't use this outside of linkhash.h: */ /* Don't use this outside of linkhash.h: */
#ifdef __UNCONST #ifdef __UNCONST