Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix support for VS 2010+ #36

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix support for VS 2010+ #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3cb8cdd
There is stdint.h since VS 2010
hcoona Oct 9, 2016
26e53cd
Fix typo: verison -> version
hcoona Oct 9, 2016
2f314c8
Use stdint.h since VS 2010.
hcoona Oct 9, 2016
0169485
fix for CMake 3.19
anporumb Mar 3, 2021
5373acc
update version to 3.0
anporumb Apr 1, 2021
c55df3c
Merge pull request #1 from anporumb/anpo_fix_for_cmake_3_19
hcoona Apr 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
project(SMHasher)

cmake_minimum_required(VERSION 2.4)
cmake_minimum_required(VERSION 3.0)

set(CMAKE_BUILD_TYPE Release)

Expand Down
5 changes: 3 additions & 2 deletions src/PMurHash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@
* any version provided by the system headers or application. */

/* First look for special cases */
#if defined(_MSC_VER)
#if defined(_MSC_VER) && _MSC_VER < 1600
#define MH_UINT32 unsigned long
#endif

/* If the compiler says it's C99 then take its word for it */
#if !defined(MH_UINT32) && ( \
defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L )
(defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
(defined(_MSC_VER) && _MSC_VER >= 1600) )
#include <stdint.h>
#define MH_UINT32 uint32_t
#endif
Expand Down
4 changes: 2 additions & 2 deletions src/pstdint.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
* include stdint.h. The hope is that one or the other can be
* used with no real difference.
*
* 5) In the current verison, if your platform can't represent
* 5) In the current version, if your platform can't represent
* int32_t, int16_t and int8_t, it just dumps out with a compiler
* error.
*
Expand Down Expand Up @@ -190,7 +190,7 @@
* do nothing else. On the Mac OS X version of gcc this is _STDINT_H_.
*/

#if ((defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L) || (defined (__WATCOMC__) && (defined (_STDINT_H_INCLUDED) || __WATCOMC__ >= 1250)) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_)) )) && !defined (_PSTDINT_H_INCLUDED)
#if ((defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L) || (defined (_MSC_VER) && _MSC_VER >= 1600) || (defined (__WATCOMC__) && (defined (_STDINT_H_INCLUDED) || __WATCOMC__ >= 1250)) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_)) )) && !defined (_PSTDINT_H_INCLUDED)
#include <stdint.h>
#define _PSTDINT_H_INCLUDED
# ifndef PRINTF_INT64_MODIFIER
Expand Down