Skip to content

Commit fa1b355

Browse files
committed
hash: Follow up fixes for murmur
Signed-off-by: Anatol Belski <ab@php.net>
1 parent 55a4344 commit fa1b355

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

ext/hash/config.w32

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ PHP_HASH = 'yes';
1111
EXTENSION('hash', 'hash.c hash_md.c hash_sha.c hash_ripemd.c hash_haval.c ' +
1212
'hash_tiger.c hash_gost.c hash_snefru.c hash_whirlpool.c ' +
1313
'hash_adler32.c hash_crc32.c hash_joaat.c hash_fnv.c ' +
14-
'hash_sha3.c hash_murmur.cpp', false);
14+
'hash_sha3.c hash_murmur.c', false);
1515

1616
var hash_sha3_dir = 'ext/hash/sha3/generic' + (X64 ? '64' : '32') + 'lc';
1717

@@ -32,7 +32,7 @@ var hash_murmur_dir = 'ext/hash/murmur';
3232
if (!CHECK_HEADER_ADD_INCLUDE('PMurHash.h', 'CFLAGS_HASH', hash_murmur_dir)) {
3333
ERROR('Unable to locate murmur headers');
3434
}
35-
ADD_SOURCES(hash_murmur_dir, 'PMurHash.cpp PMurHash128.cpp', 'hash');
35+
ADD_SOURCES(hash_murmur_dir, 'PMurHash.c PMurHash128.c', 'hash');
3636

3737
PHP_INSTALL_HEADERS('ext/hash/', 'php_hash.h php_hash_md.h php_hash_sha.h ' +
3838
'php_hash_ripemd.h php_hash_haval.h php_hash_tiger.h ' +

ext/hash/hash_murmur.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
#include "murmur/PMurHash.h"
2121
#include "murmur/PMurHash128.h"
22-
#define FORCE_INLINE zend_always_inline
23-
#include "murmur/endianness.h"
2422

2523

2624
const php_hash_ops php_hash_murmur3a_ops = {/*{{{*/

0 commit comments

Comments
 (0)