diff options
| author | megamage <none@none> | 2009-02-18 11:36:19 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-18 11:36:19 -0600 |
| commit | 31637d4aac6ae2081ccb3db976cab17936019f1a (patch) | |
| tree | a0e098d4afafaddcb901486d00da1563ecd628b9 /src/framework/Platform | |
| parent | 017f309b5b5b981b6edfe0ae071971d513828a20 (diff) | |
| parent | 7bff1c1d60b78ba78f2ab0a9c67bdde80427ea30 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/framework/Platform')
| -rw-r--r-- | src/framework/Platform/CompilerDefs.h | 1 | ||||
| -rw-r--r-- | src/framework/Platform/Define.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/framework/Platform/CompilerDefs.h b/src/framework/Platform/CompilerDefs.h index 2bf7f7872f9..691acb2e6d7 100644 --- a/src/framework/Platform/CompilerDefs.h +++ b/src/framework/Platform/CompilerDefs.h @@ -61,3 +61,4 @@ # pragma warning( disable : 4786 ) // identifier was truncated to '255' characters in the debug information #endif #endif + diff --git a/src/framework/Platform/Define.h b/src/framework/Platform/Define.h index 574793a285d..e4d45f6b456 100644 --- a/src/framework/Platform/Define.h +++ b/src/framework/Platform/Define.h @@ -123,3 +123,4 @@ typedef uint32 DWORD; typedef uint64 OBJECT_HANDLE; #endif //TRINITY_DEFINE_H + |