Second Life viewer sources 1.18.0.6

1 files changed, 6 insertions, 16 deletions

diff --git a/linden/indra/llcommon/llpreprocessor.h b/linden/indra/llcommon/llpreprocessor.h
index 76145c5..495b9e8 100644
--- a/linden/indra/llcommon/llpreprocessor.h
+++ b/linden/indra/llcommon/llpreprocessor.h
@@ -71,22 +71,12 @@
         #define MOZILLA_INTERNAL_API 1
 #endif
 
-// Figure out differences between compilers
-#if defined(__GNUC__)
+// Deal with minor differences on Unixy OSes.
+#if LL_DARWIN || LL_LINUX
         #define GCC_VERSION (__GNUC__ * 10000 \
                                                 + __GNUC_MINOR__ * 100 \
                                                 + __GNUC_PATCHLEVEL__)
-        #ifndef LL_GNUC
-                #define LL_GNUC 1
-        #endif
-#elif defined(__MSVC_VER__) || defined(_MSC_VER)
-        #ifndef LL_MSVC
-                #define LL_MSVC 1
-        #endif
-#endif
 
-// Deal with minor differences on Unixy OSes.
-#if LL_DARWIN || LL_LINUX
         // Different name, same functionality.
         #define stricmp strcasecmp
         #define strnicmp strncasecmp
@@ -99,9 +89,9 @@
 #endif
 
 // Deal with the differeneces on Windows
-#if LL_MSVC
+#if LL_WINDOWS
 #define snprintf safe_snprintf          /* Flawfinder: ignore */
-#endif  // LL_MSVC
+#endif  // LL_WINDOWS
 
 // Static linking with apr on windows needs to be declared.
 #ifdef LL_WINDOWS
@@ -120,7 +110,7 @@
 
 
 // Deal with VC6 problems
-#if LL_MSVC
+#if defined(LL_WINDOWS)
 #pragma warning( 3           : 4701 )   // "local variable used without being initialized"  Treat this as level 3, not level 4.
 #pragma warning( 3           : 4702 )   // "unreachable code"  Treat this as level 3, not level 4.
 #pragma warning( 3           : 4189 )   // "local variable initialized but not referenced"  Treat this as level 3, not level 4.
@@ -131,6 +121,6 @@
 #pragma warning( disable : 4503 )       // 'decorated name length exceeded, name was truncated'. Does not seem to affect compilation.
 #pragma warning( disable : 4800 )       // 'BOOL' : forcing value to bool 'true' or 'false' (performance warning)
 #pragma warning( disable : 4996 )       // warning: deprecated
-#endif  //      LL_MSVC
+#endif  //      LL_WINDOWS
 
 #endif  //      not LL_LINDEN_PREPROCESSOR_H