- Removed a vi turd from a comment in src/r_misc.c

- Commented out some suspicious ifdefs in src/sys_dosa.S
- Fixed USE_ASM to be HAVE_MASM in src/ctf/q_shared.c
- something similar in src/baseq2/q_shared.c

src/ctf/q_shared.c

@@ -345,7 +345,7 @@ BoxOnPlaneSide
 Returns 1, 2, or 1 + 2
 ==================
 */
-#ifdef USE_ASM
+#ifdef HAVE_MASM
 # pragma warning( disable: 4035 )
 __declspec( naked ) int BoxOnPlaneSide (vec3_t emins, vec3_t emaxs, struct cplane_s *p)
 {

src/r_misc.c

@@ -291,7 +291,6 @@ void R_TransformPlane (mplane_t *p, float *normal, float *dist)
 /*
 ===============
 R_SetUpFrustumIndexes
-:cn
 */
 void R_SetUpFrustumIndexes (void)
 {

src/sys_dosa.S

@@ -1,11 +1,30 @@
-//
-// sys_dosa.s
-// x86 assembly-language DOS-dependent routines.
+/* $Id$
+ *
+ * x86 assembly-language DOS-dependent routines
+ *
+ * Copyright (C) 1997-2001 Id Software, Inc.
+ * Copyright (c) 2002 The Quakeforge Project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+ *
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#include "../src/qasm.h"
+#include "qasm.h"
 
 
 	.data
@@ -75,22 +94,24 @@ C(Sys_PopFPCW):
 C(Sys_SetFPCW):
 	fnstcw	cw
 	movl	cw,%eax
+/* These seem suspicious
 #ifdef USE_ASM
+*/
 	andb	$0xF0,%ah
 	orb		$0x03,%ah	// round mode, 64-bit precision
-#endif
+/*#endif*/
 	movl	%eax,full_cw
 
-#ifdef USE_ASM
+/*#ifdef USE_ASM*/
 	andb	$0xF0,%ah
 	orb		$0x0C,%ah	// chop mode, single precision
-#endif
+/*#endif*/
 	movl	%eax,single_cw
 
-#ifdef USE_ASM
+/*#ifdef USE_ASM*/
 	andb	$0xF0,%ah
 	orb		$0x08,%ah	// ceil mode, single precision
-#endif
+/*#endif*/
 	movl	%eax,ceil_cw
 
 	ret