From a0c29e7dd67abb15c74c85f07741784877edfdcd Mon Sep 17 00:00:00 2001
From: Joe Ludwig <joe@valvesoftware.com>
Date: Mon, 2 Sep 2013 11:39:10 -0700
Subject: General: * Fixed a variety of server browser issues with mods based
 on this SDK * Fixed many warnings on various platforms * Added source code
 for fgdlib and raytrace * Updated many source files with the latest shared
 source from TF2.

OSX:
* Added support for Xcode 4.6
* Switched OSX builds to use Xcode instead of makefiles
* Moved libs from src/lib/osx32 to src/lib/public/osx32 or src/lib/common/osx32 to match windows better.

Linux:
* Moved libs from src/lib/linux32 to src/lib/public/linux32 or src/lib/common/linux32 to match windows better.
---
 mp/src/public/tier1/fmtstr.h    | 11 +++++++++--
 mp/src/public/tier1/utlstring.h |  3 ++-
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'mp/src/public/tier1')

diff --git a/mp/src/public/tier1/fmtstr.h b/mp/src/public/tier1/fmtstr.h
index d9d5fef2..64d44add 100644
--- a/mp/src/public/tier1/fmtstr.h
+++ b/mp/src/public/tier1/fmtstr.h
@@ -18,6 +18,9 @@
 #if defined( _WIN32 )
 #pragma once
 #endif
+#if defined(POSIX)
+#pragma GCC visibility push(hidden)
+#endif
 
 //=============================================================================
 
@@ -28,7 +31,7 @@
 		int     result; \
 		va_list arg_ptr; \
 		bool bTruncated = false; \
-		static int scAsserted = 0; \
+		static unsigned int scAsserted = 0; \
 	\
 		va_start(arg_ptr, lastArg); \
 		result = Q_vsnprintfRet( (szBuf), nBufSize, (*(ppszFormat)), arg_ptr, &bTruncated ); \
@@ -115,7 +118,7 @@ public:
 		m_nLength = 0; 
 	}
 
-	void AppendFormat( PRINTF_FORMAT_STRING const char *pchFormat, ... ) 
+	void AppendFormat(PRINTF_FORMAT_STRING const char *pchFormat, ... ) FMTFUNCTION( 2, 3 )
 	{ 
 		char *pchEnd = m_szBuf + m_nLength; 
 		FmtStrVSNPrintf( pchEnd, SIZE_BUF - m_nLength, m_bQuietTruncation, &pchFormat, m_nLength, pchFormat ); 
@@ -174,6 +177,10 @@ void CFmtStrN<SIZE_BUF>::AppendFormatV( const char *pchFormat, va_list args )
 }
 
 
+#if defined(POSIX)
+#pragma GCC visibility pop
+#endif
+
 //-----------------------------------------------------------------------------
 //
 // Purpose: Default-sized string formatter
diff --git a/mp/src/public/tier1/utlstring.h b/mp/src/public/tier1/utlstring.h
index eec22dfa..26d98338 100644
--- a/mp/src/public/tier1/utlstring.h
+++ b/mp/src/public/tier1/utlstring.h
@@ -16,7 +16,8 @@
 #include "limits.h"
 
 #if defined( OSX )
-inline wchar_t *wcsdup(const wchar_t *pString)
+#define wcsdup wcsdup_osx
+inline wchar_t *wcsdup_osx(const wchar_t *pString)
 {
 	wchar_t *pMemory;
 
-- 
cgit v1.2.3