Clean up old __GNUC__ compiler hacks

Author: Rye

indra/llaudio/llvorbisencode.cpp

@@ -34,38 +34,6 @@
 #include "llmath.h"
 #include "llapr.h"
 
-//#if LL_DARWIN
-// MBW -- XXX -- Getting rid of SecondLifeVorbis for now
-#if 0
-#include "VorbisFramework.h"
-
-#define vorbis_analysis             mac_vorbis_analysis
-#define vorbis_analysis_headerout   mac_vorbis_analysis_headerout
-#define vorbis_analysis_init        mac_vorbis_analysis_init
-#define vorbis_encode_ctl           mac_vorbis_encode_ctl
-#define vorbis_encode_setup_init    mac_vorbis_encode_setup_init
-#define vorbis_encode_setup_managed mac_vorbis_encode_setup_managed
-
-#define vorbis_info_init            mac_vorbis_info_init
-#define vorbis_info_clear           mac_vorbis_info_clear
-#define vorbis_comment_init         mac_vorbis_comment_init
-#define vorbis_comment_clear        mac_vorbis_comment_clear
-#define vorbis_block_init           mac_vorbis_block_init
-#define vorbis_block_clear          mac_vorbis_block_clear
-#define vorbis_dsp_clear            mac_vorbis_dsp_clear
-#define vorbis_analysis_buffer      mac_vorbis_analysis_buffer
-#define vorbis_analysis_wrote       mac_vorbis_analysis_wrote
-#define vorbis_analysis_blockout    mac_vorbis_analysis_blockout
-
-#define ogg_stream_packetin         mac_ogg_stream_packetin
-#define ogg_stream_init             mac_ogg_stream_init
-#define ogg_stream_flush            mac_ogg_stream_flush
-#define ogg_stream_pageout          mac_ogg_stream_pageout
-#define ogg_page_eos                mac_ogg_page_eos
-#define ogg_stream_clear            mac_ogg_stream_clear
-
-#endif
-
 S32 check_for_invalid_wav_formats(const std::string& in_fname, std::string& error_msg)
 {
     U16 num_channels = 0;

indra/llcommon/lldate.cpp

@@ -124,11 +124,7 @@ void LLDate::toStream(std::ostream& s) const
     }
 
     s << std::dec << std::setfill('0');
-#if( LL_WINDOWS || __GNUC__ > 2)
     s << std::right;
-#else
-    s.setf(ios::right);
-#endif
     s        << std::setw(4) << (exp_time.tm_year + 1900)
       << '-' << std::setw(2) << (exp_time.tm_mon + 1)
       << '-' << std::setw(2) << (exp_time.tm_mday)

indra/llcommon/llsdserialize.cpp

@@ -1424,11 +1424,7 @@ S32 LLSDNotationFormatter::format_impl(const LLSD& data, std::ostream& ostr,
 
     case LLSD::TypeBoolean:
         if(mBoolAlpha ||
-#if( LL_WINDOWS || __GNUC__ > 2)
            (ostr.flags() & std::ios::boolalpha)
-#else
-           (ostr.flags() & 0x0100)
-#endif
             )
         {
             ostr << (data.asBoolean()

indra/llcommon/llstl.h

@@ -522,18 +522,8 @@ llbind2nd(const _Operation& __oper, const _Tp& __x)
 inline
 bool before(const std::type_info* lhs, const std::type_info* rhs)
 {
-#if LL_LINUX && defined(__GNUC__) && ((__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 4))
-    // If we're building on Linux with gcc, and it's either gcc 3.x or
-    // 4.{0,1,2,3}, then we have to use a workaround. Note that we use gcc on
-    // Mac too, and some people build with gcc on Windows (cygwin or mingw).
-    // On Linux, different load modules may produce different type_info*
-    // pointers for the same type. Have to compare name strings to get good
-    // results.
-    return strcmp(lhs->name(), rhs->name()) < 0;
-#else  // not Linux, or gcc 4.4+
     // Just use before(), as we normally would
     return lhs->before(*rhs);
-#endif
 }
 
 /**

indra/llmessage/llbufferstream.cpp

@@ -234,17 +234,10 @@ int LLBufferStreamBuf::sync()
 }
 
 // virtual
-#if( LL_WINDOWS || __GNUC__ > 2)
 LLBufferStreamBuf::pos_type LLBufferStreamBuf::seekoff(
     LLBufferStreamBuf::off_type off,
     std::ios::seekdir way,
     std::ios::openmode which)
-#else
-streampos LLBufferStreamBuf::seekoff(
-    streamoff off,
-    std::ios::seekdir way,
-    std::ios::openmode which)
-#endif
 {
     if(!mBuffer
        || ((way == std::ios::beg) && (off < 0))
@@ -319,12 +312,8 @@ streampos LLBufferStreamBuf::seekoff(
         }
     }
 
-#if( LL_WINDOWS || __GNUC__ > 2 )
     S32 rv = (S32)(intptr_t)address;
     return (pos_type)rv;
-#else
-    return (streampos)address;
-#endif
 }
 
 

indra/llmessage/llbufferstream.h

@@ -48,10 +48,8 @@ class LLBufferStreamBuf : public std::streambuf
     virtual ~LLBufferStreamBuf();
 
 protected:
-#if( LL_WINDOWS || __GNUC__ > 2 )
     typedef std::streambuf::pos_type pos_type;
     typedef std::streambuf::off_type off_type;
-#endif
 
     /* @name streambuf vrtual implementations
      */
@@ -87,17 +85,10 @@ class LLBufferStreamBuf : public std::streambuf
      * or both masked together.
      * @return Returns the new position or an invalid position on failure.
      */
-#if( LL_WINDOWS || __GNUC__ > 2)
     virtual pos_type seekoff(
         off_type off,
         std::ios::seekdir way,
         std::ios::openmode which);
-#else
-    virtual streampos seekoff(
-        streamoff off,
-        std::ios::seekdir way,
-        std::ios::openmode which);
-#endif
 
     /*
      * @brief Get s sequence of characters from the input

indra/llrender/llgl.cpp

@@ -1116,17 +1116,6 @@ bool LLGLManager::initGL()
     if (mGLVersion >= 2.f)
     {
         parse_glsl_version(mGLSLVersionMajor, mGLSLVersionMinor);
-
-#if 0 && LL_DARWIN
-        // TODO maybe switch to using a core profile for GL 3.2?
-        // https://stackoverflow.com/a/19868861
-        //never use GLSL greater than 1.20 on OSX
-        if (mGLSLVersionMajor > 1 || mGLSLVersionMinor > 30)
-        {
-            mGLSLVersionMajor = 1;
-            mGLSLVersionMinor = 30;
-        }
-#endif
     }
 
     if (mGLVersion >= 2.1f && LLImageGL::sCompressTextures)

indra/newview/llviewerjointmesh.cpp

@@ -56,12 +56,6 @@
 #include "llmatrix4a.h"
 #include "llperfstats.h"
 
-#if !LL_DARWIN && !LL_LINUX
-extern PFNGLWEIGHTPOINTERARBPROC glWeightPointerARB;
-extern PFNGLWEIGHTFVARBPROC glWeightfvARB;
-extern PFNGLVERTEXBLENDARBPROC glVertexBlendARB;
-#endif
-
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // LLViewerJointMesh