diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-28 22:14:48 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-28 22:14:48 +0100 |
| commit | b2d05c9cdd19abf005f249ace7f59d2c4fc2bbf1 (patch) | |
| tree | 72b2717bf2a10cf86fc49f99ffde2bcd0100f708 /src/server/collision/BoundingIntervalHierarchy.cpp | |
| parent | 47d7c3a6adbc9f11066a26136bbad440ee3c8641 (diff) | |
| parent | d069e1b6b4d9f839df1a823d0ec1ddfa6dea303c (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Creature/Creature.h
src/server/game/Entities/Player/Player.h
src/server/game/Spells/SpellMgr.cpp
Diffstat (limited to 'src/server/collision/BoundingIntervalHierarchy.cpp')
| -rw-r--r-- | src/server/collision/BoundingIntervalHierarchy.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/collision/BoundingIntervalHierarchy.cpp b/src/server/collision/BoundingIntervalHierarchy.cpp index bca738d1ff6..4c1f449da25 100644 --- a/src/server/collision/BoundingIntervalHierarchy.cpp +++ b/src/server/collision/BoundingIntervalHierarchy.cpp @@ -20,6 +20,8 @@ #if defined __APPLE__ #define isnan std::isnan +#elif defined __CYGWIN__ + #define isnan std::isnan #elif defined _MSC_VER #define isnan _isnan #endif |