* Merge unified-sdl to trunk

* Bump Q3_VERSION to 1.35


git-svn-id: svn://svn.icculus.org/quake3/trunk@1161 edf5b092-35ff-0310-97b2-ce42778d08ea

1 files changed, 2 insertions, 7 deletions

diff --git a/code/game/bg_lib.c b/code/game/bg_lib.c
index 997b9c9..1e65ae5 100644
--- a/code/game/bg_lib.c
+++ b/code/game/bg_lib.c
@@ -43,7 +43,6 @@ static char sccsid[] = "@(#)qsort.c	8.1 (Berkeley) 6/4/93";
 static const char rcsid[] =
 #endif /* LIBC_SCCS and not lint */
 
-// bk001127 - needed for DLL's
 #if !defined( Q3_VM )
 typedef int		 cmp_t(const void *, const void *);
 #endif
@@ -189,8 +188,6 @@ loop:	SWAPINIT(a, es);
 
 
 // this file is excluded from release builds because of intrinsics
-
-// bk001211 - gcc errors on compiling strcpy:  parse error before `__extension__'
 #if defined ( Q3_VM )
 
 size_t strlen( const char *string ) {
@@ -265,7 +262,7 @@ char *strstr( const char *string, const char *strCharSet ) {
 	}
 	return (char *)0;
 }
-#endif // bk001211
+#endif
 
 #if defined ( Q3_VM )
 int tolower( int c ) {
@@ -754,8 +751,6 @@ double atan2( double y, double x ) {
 #endif
 
 #ifdef Q3_VM
-// bk001127 - guarded this tan replacement 
-// ld: undefined versioned symbol name tan@@GLIBC_2.0
 double tan( double x ) {
 	return sin(x) / cos(x);
 }
@@ -844,7 +839,7 @@ double _atof( const char **stringPtr ) {
 	const char	*string;
 	float sign;
 	float value;
-	int		c = '0'; // bk001211 - uninitialized use possible
+	int		c = '0';
 
 	string = *stringPtr;