diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-07-09 00:43:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-09 00:43:36 +0300 |
| commit | cd5d35ddab52ae577e286140ee54664202a0091d (patch) | |
| tree | cf046f1ada76fc73d11ca9fa27075a199a9c2c73 /indra | |
| parent | f56ef28ccf168b5f9d42a9d405924ca604326ff7 (diff) | |
| parent | 499a717f62458ecddac270f069d283cf2ed62712 (diff) | |
Merge pull request #1945 from Ansariel/develop_msvc7
Remove ancient MSVC7 code
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/llpreprocessor.h | 3 | ||||
| -rw-r--r-- | indra/newview/llappviewerwin32.cpp | 13 |
2 files changed, 0 insertions, 16 deletions
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h index 0d87d1e433..a528cc7fd8 100644 --- a/indra/llcommon/llpreprocessor.h +++ b/indra/llcommon/llpreprocessor.h @@ -74,9 +74,6 @@ #ifndef LL_MSVC #define LL_MSVC 1 #endif - #if _MSC_VER < 1400 - #define LL_MSVC7 //Visual C++ 2003 or earlier - #endif #endif // Deal with minor differences on Unixy OSes. diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index 83fa4a3ca9..c4c6dd3327 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -197,19 +197,6 @@ LONG WINAPI catchallCrashHandler(EXCEPTION_POINTERS * /*ExceptionInfo*/) return 0; } -// *FIX:Mani - This hack is to fix a linker issue with libndofdev.lib -// The lib was compiled under VS2005 - in VS2003 we need to remap assert -#ifdef LL_DEBUG -#ifdef LL_MSVC7 -extern "C" { - void _wassert(const wchar_t * _Message, const wchar_t *_File, unsigned _Line) - { - LL_ERRS() << _Message << LL_ENDL; - } -} -#endif -#endif - const std::string LLAppViewerWin32::sWindowClass = "Second Life"; /* |