[12920] Don't add compiler backend defines ourselves! Fixes 32-bit GC…

…C builds. Identifiers with a double underscore anywhere are reserved for the standard library headers and the compiler, so don't mess with them!
cmangos · Aug 30, 2015 · 5710c18 · 5710c18
1 parent addd971
commit 5710c18
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmake/compiler/gcc/settings.cmake b/cmake/compiler/gcc/settings.cmake
@@ -7,7 +7,7 @@ if(PLATFORM EQUAL X86)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SSE_FLAGS}")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SSE_FLAGS}")
 endif()
-add_definitions(-DHAVE_SSE2 -D__SSE2__)
+add_definitions(-DHAVE_SSE2)
 message(STATUS "GCC: SFMT enabled, SSE2 flags forced")
 
 if(WARNINGS)

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "12919"
+ #define REVISION_NR "12920"
 #endif // __REVISION_NR_H__