Merge branch 'develop-linux' into marchcat/slua-linux

# Conflicts:
#	indra/newview/llfeaturemanager.cpp
#	indra/newview/llstartup.cpp

1 files changed, 0 insertions, 11 deletions

diff --git a/indra/llmessage/llbufferstream.cpp b/indra/llmessage/llbufferstream.cpp
index 2c745f6fe4..cb5a4c1824 100644
--- a/indra/llmessage/llbufferstream.cpp
+++ b/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
 }