diff options
| -rw-r--r-- | cmake/genrev.cmake | 2 | ||||
| -rw-r--r-- | cmake/macros/ConfigureBoost.cmake | 2 | ||||
| -rw-r--r-- | cmake/macros/FindMySQL.cmake | 6 | ||||
| -rw-r--r-- | cmake/macros/FindReadline.cmake | 2 | ||||
| -rw-r--r-- | cmake/stack_direction.c | 10 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_shaman.cpp | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/cmake/genrev.cmake b/cmake/genrev.cmake index f4885f53e1c..26c26d8ad62 100644 --- a/cmake/genrev.cmake +++ b/cmake/genrev.cmake @@ -41,7 +41,7 @@ else() OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET ) - + # Also retrieve branch name execute_process( COMMAND "${GIT_EXEC}" rev-parse --abbrev-ref HEAD diff --git a/cmake/macros/ConfigureBoost.cmake b/cmake/macros/ConfigureBoost.cmake index ae5ac633ce2..3d3791b8a93 100644 --- a/cmake/macros/ConfigureBoost.cmake +++ b/cmake/macros/ConfigureBoost.cmake @@ -20,7 +20,7 @@ if(WIN32) set(Boost_USE_STATIC_LIBS ON)
set(Boost_USE_MULTITHREADED ON)
set(Boost_USE_STATIC_RUNTIME OFF)
-
+
get_WIN32_WINNT(ver)
add_definitions(-D_WIN32_WINNT=${ver})
endif()
diff --git a/cmake/macros/FindMySQL.cmake b/cmake/macros/FindMySQL.cmake index 036b8302c75..7650a83c571 100644 --- a/cmake/macros/FindMySQL.cmake +++ b/cmake/macros/FindMySQL.cmake @@ -1,6 +1,6 @@ # # Find the MySQL client includes and library -# +# # This module defines # MYSQL_INCLUDE_DIR, where to find mysql.h @@ -95,7 +95,7 @@ find_path(MYSQL_INCLUDE_DIR if( UNIX ) foreach(LIB ${MYSQL_ADD_LIBRARIES}) - find_library( MYSQL_LIBRARY + find_library( MYSQL_LIBRARY NAMES mysql libmysql ${LIB} PATHS @@ -111,7 +111,7 @@ if( UNIX ) endif( UNIX ) if( WIN32 ) - find_library( MYSQL_LIBRARY + find_library( MYSQL_LIBRARY NAMES libmysql PATHS diff --git a/cmake/macros/FindReadline.cmake b/cmake/macros/FindReadline.cmake index 07c6b368df8..34af35204b5 100644 --- a/cmake/macros/FindReadline.cmake +++ b/cmake/macros/FindReadline.cmake @@ -5,7 +5,7 @@ # READLINE_FOUND - TRUE if READLINE was found FIND_PATH(READLINE_INCLUDE_DIR readline/readline.h) -FIND_LIBRARY(READLINE_LIBRARY NAMES readline) +FIND_LIBRARY(READLINE_LIBRARY NAMES readline) IF (READLINE_INCLUDE_DIR AND READLINE_LIBRARY) SET(READLINE_FOUND TRUE) diff --git a/cmake/stack_direction.c b/cmake/stack_direction.c index 11bcf803bfa..4797d8e14e7 100644 --- a/cmake/stack_direction.c +++ b/cmake/stack_direction.c @@ -1,5 +1,5 @@ /* Copyright (C) 2009 Sun Microsystems, Inc - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. @@ -14,17 +14,17 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ /* Check stack direction (0-down, 1-up) */ -int f(int *a) +int f(int *a) { int b; - return(&b > a)?1:0; + return(&b > a)?1:0; } /* - Prevent compiler optimizations by calling function + Prevent compiler optimizations by calling function through pointer. */ volatile int (*ptr_f)(int *) = f; -int main() +int main() { int a; return ptr_f(&a); diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 593ce9a54de..bba1f4e298b 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -312,7 +312,7 @@ class spell_sha_earth_shield : public SpellScriptLoader amount = GetUnitOwner()->SpellHealingBonusTaken(caster, GetSpellInfo(), amount, HEAL); //! WORKAROUND - // If target is affected by healing reduction, modifier is guaranteed to be negative + // If target is affected by healing reduction, modifier is guaranteed to be negative // value (e.g. -50). To revert the effect, multiply amount with reciprocal of relative value: // (100 / ((-1) * modifier)) * 100 = (-1) * 100 * 100 / modifier = -10000 / modifier if (int32 modifier = GetUnitOwner()->GetMaxNegativeAuraModifier(SPELL_AURA_MOD_HEALING_PCT)) |