Merge pull request #1 from mynameisfiber/master

Improved portability
hajimes · Mar 3, 2013 · a36f24d · a36f24d
2 parents 74cf94b + fdb0a30
commit a36f24d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/MurmurHash3.cpp b/MurmurHash3.cpp
@@ -29,7 +29,12 @@
 
 #else	// defined(_MSC_VER)
 
-#define	FORCE_INLINE __attribute__((always_inline))
+#if defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && GNUC_MINOR >= 4))
+/* gcc version >= 4.4 4.1 = RHEL 5, 4.4 = RHEL 6. Don't inline for RHEL 5 gcc which is 4.1*/
+#define FORCE_INLINE attribute((always_inline))
+#else
+#define FORCE_INLINE 
+#endif
 
 inline uint32_t rotl32 ( uint32_t x, int8_t r )
 {

diff --git a/PKG-INFO b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: mmh3
-Version: 2.1
+Version: 2.2
 Summary: Python library for MurmurHash3, a set of fast and robust hash functions.
 Home-page: http://packages.python.org/mmh3
 Author: Hajime Senuma

diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
     sources = ['mmh3module.cpp', 'MurmurHash3.cpp'])
 
 setup(name = 'mmh3',
-    version = '2.1',
+    version = '2.2',
     description = 'Python library for MurmurHash (MurmurHash3), a set of fast and robust hash functions.',
     license = 'Public Domain',
     author = 'Hajime Senuma',