Bug 1300124 - make MurmurHash3.cpp compile with clang-cl; r=bkelly
authorNathan Froyd <froydnj@mozilla.com>
Tue, 06 Sep 2016 15:46:01 -0400
changeset 312875 a9e15f6064208d65164c60384d763741dcc708fa
parent 312874 4266dca3ab7df795abc8865beb0aacc5884ffbfc
child 312876 556e6c27c5ca33cd7f21bd7ad1be3c8976da909d
push id30663
push usercbook@mozilla.com
push dateWed, 07 Sep 2016 15:12:31 +0000
treeherdermozilla-central@3d0b41fdd93b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbkelly
bugs1300124
milestone51.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1300124 - make MurmurHash3.cpp compile with clang-cl; r=bkelly Including headers inside anonymous namespaces, especially standard headers, is super-unusual; let's just move the header to the toplevel instead. MozReview-Commit-ID: CNykWQA5ndY
dom/canvas/MurmurHash3.cpp
--- a/dom/canvas/MurmurHash3.cpp
+++ b/dom/canvas/MurmurHash3.cpp
@@ -3,30 +3,29 @@
 // domain. The author hereby disclaims copyright to this source code.
 
 // Note - The x86 and x64 versions do _not_ produce the same results, as the
 // algorithms are optimized for their respective platforms. You can still
 // compile and run any of them on any platform, but your performance with the
 // non-native version will be less than optimal.
 
 #include "MurmurHash3.h"
+#include <stdlib.h>
 
 namespace {
 
 //-----------------------------------------------------------------------------
 // Platform-specific functions and macros
 
 // Microsoft Visual Studio
 
 #if defined(_MSC_VER)
 
 #define FORCE_INLINE	__forceinline
 
-#include <stdlib.h>
-
 #define ROTL32(x,y)	_rotl(x,y)
 #define ROTL64(x,y)	_rotl64(x,y)
 
 #define BIG_CONSTANT(x) (x)
 
 // Other compilers
 
 #else	// defined(_MSC_VER)