Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Romanov <a.romanov@blend4web.com>2017-04-17 13:41:05 +0300
committerAlexander Romanov <a.romanov@blend4web.com>2017-04-17 13:41:05 +0300
commit11f4b407d4b5b5295cbbef577ec4aac2acf24b49 (patch)
tree522730cdbcab4f10b3c90aea5df7c6a6655a885e /source/blender/blenlib
parent57d31171d0c92358325869bdbcd3dbddbf2cdfd5 (diff)
Fix build error on Windows introduced in D2425
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r--source/blender/blenlib/BLI_hash.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenlib/BLI_hash.h b/source/blender/blenlib/BLI_hash.h
index 551143f5d72..50c7a7f9f0f 100644
--- a/source/blender/blenlib/BLI_hash.h
+++ b/source/blender/blenlib/BLI_hash.h
@@ -25,7 +25,7 @@
* \ingroup bli
*/
-static inline unsigned int BLI_hash_int_2d(unsigned int kx, unsigned int ky)
+BLI_INLINE unsigned int BLI_hash_int_2d(unsigned int kx, unsigned int ky)
{
#define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
@@ -48,7 +48,7 @@ static inline unsigned int BLI_hash_int_2d(unsigned int kx, unsigned int ky)
#undef rot
}
-static inline unsigned int BLI_hash_string(const char *str)
+BLI_INLINE unsigned int BLI_hash_string(const char *str)
{
unsigned int i = 0, c;
@@ -58,7 +58,7 @@ static inline unsigned int BLI_hash_string(const char *str)
return i;
}
-static inline unsigned int BLI_hash_int(unsigned int k)
+BLI_INLINE unsigned int BLI_hash_int(unsigned int k)
{
return BLI_hash_int_2d(k, 0);
}