Index: src/tools/ufo2map/common/cmdlib.h
===================================================================
--- src/tools/ufo2map/common/cmdlib.h	(Revision 9369)
+++ src/tools/ufo2map/common/cmdlib.h	(Arbeitskopie)
@@ -8,15 +8,16 @@
 #  define  __attribute__(x)  /*NOTHING*/
 #endif

+
 #ifdef _MSC_VER
-#pragma warning(disable : 4244)     /* MIPS */
-#pragma warning(disable : 4136)     /* X86 */
-#pragma warning(disable : 4051)     /* ALPHA */
+#  define inline __inline
+#  pragma warning(disable : 4244)     /* MIPS */
+#  pragma warning(disable : 4136)     /* X86 */
+#  pragma warning(disable : 4051)     /* ALPHA */
+#  pragma warning(disable : 4018)     /* signed/unsigned mismatch */
+#  pragma warning(disable : 4305)     /* truncate from double to float */
+#endif	/* _MSC_VER */

-#pragma warning(disable : 4018)     /* signed/unsigned mismatch */
-#pragma warning(disable : 4305)     /* truncate from double to float */
-#endif
-
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
Index: src/tools/ufo2map/common/mathlib.c
===================================================================
--- src/tools/ufo2map/common/mathlib.c	(Revision 9369)
+++ src/tools/ufo2map/common/mathlib.c	(Arbeitskopie)
@@ -75,7 +75,7 @@
 /**
  * @brief
  */
-vec_t Q_rint (const vec_t in)
+inline vec_t Q_rint (const vec_t in)
 {
 	return floor(in + 0.5);
 }
@@ -83,7 +83,7 @@
 /**
  * @brief Sets vector_out (vc) to vevtor1 (va) + scale * vector2 (vb)
  */
-void VectorMA (const vec3_t va, const vec_t scale, const vec3_t vb, vec3_t vc)
+inline void VectorMA (const vec3_t va, const vec_t scale, const vec3_t vb, vec3_t vc)
 {
 	vc[0] = va[0] + scale * vb[0];
 	vc[1] = va[1] + scale * vb[1];
@@ -93,7 +93,7 @@
 /**
  * @brief Cross prodcut of v1 and v2 saved in cross
  */
-void CrossProduct (const vec3_t v1, const vec3_t v2, vec3_t cross)
+inline void CrossProduct (const vec3_t v1, const vec3_t v2, vec3_t cross)
 {
 	cross[0] = v1[1] * v2[2] - v1[2] * v2[1];
 	cross[1] = v1[2] * v2[0] - v1[0] * v2[2];
@@ -103,7 +103,7 @@
 /**
  * @brief Dot product of v1 and v2
  */
-vec_t _DotProduct (const vec3_t v1, vec3_t v2)
+inline vec_t _DotProduct (const vec3_t v1, vec3_t v2)
 {
 	return v1[0] * v2[0] + v1[1] * v2[1] + v1[2] * v2[2];
 }
@@ -111,7 +111,7 @@
 /**
  * @brief
  */
-void _VectorSubtract (const vec3_t va, const vec3_t vb, vec3_t out)
+inline void _VectorSubtract (const vec3_t va, const vec3_t vb, vec3_t out)
 {
 	out[0] = va[0]-vb[0];
 	out[1] = va[1]-vb[1];
@@ -121,7 +121,7 @@
 /**
  * @brief
  */
-void _VectorAdd (const vec3_t va, const vec3_t vb, vec3_t out)
+inline void _VectorAdd (const vec3_t va, const vec3_t vb, vec3_t out)
 {
 	out[0] = va[0] + vb[0];
 	out[1] = va[1] + vb[1];
@@ -131,7 +131,7 @@
 /**
  * @brief
  */
-void _VectorCopy (const vec3_t in, vec3_t out)
+inline void _VectorCopy (const vec3_t in, vec3_t out)
 {
 	out[0] = in[0];
 	out[1] = in[1];
@@ -141,7 +141,7 @@
 /**
  * @brief Sets out to scale * v
  */
-void _VectorScale (const vec3_t v, const vec_t scale, vec3_t out)
+inline void _VectorScale (const vec3_t v, const vec_t scale, vec3_t out)
 {
 	out[0] = v[0] * scale;
 	out[1] = v[1] * scale;
@@ -196,7 +196,7 @@
 /**
  * @brief Sets vector to -1 * v
  */
-void VectorInverse (vec3_t v)
+inline void VectorInverse (vec3_t v)
 {
 	v[0] = -v[0];
 	v[1] = -v[1];
@@ -207,7 +207,7 @@
  * @brief Sets mins and maxs to their starting points before using AddPointToBounds
  * @sa AddPointToBounds
  */
-void ClearBounds (vec3_t mins, vec3_t maxs)
+inline void ClearBounds (vec3_t mins, vec3_t maxs)
 {
 	mins[0] = mins[1] = mins[2] = 99999;
 	maxs[0] = maxs[1] = maxs[2] = -99999;
Index: src/ports/win32/sys_win.c
===================================================================
--- src/ports/win32/sys_win.c	(Revision 9381)
+++ src/ports/win32/sys_win.c	(Arbeitskopie)
@@ -1011,7 +1011,7 @@
 {
 	if (!libHandle)
 		Com_Error(ERR_DROP, "Sys_FreeLibrary: No valid handle given\n");
-	if (!FreeLibrary(libHandle))
+	if (!FreeLibrary((HMODULE)libHandle))
 		Com_Error(ERR_DROP, "Sys_FreeLibrary: dlclose() failed\n");
 }

@@ -1023,5 +1023,5 @@
 {
 	if (!libHandle)
 		Com_Error(ERR_DROP, "Sys_GetProcAddress: No valid libHandle given\n");
-	return GetProcAddress(libHandle, procName);
+	return GetProcAddress((HMODULE)libHandle, procName);
 }
Index: src/game/q_shared.c
===================================================================
--- src/game/q_shared.c	(Revision 9381)
+++ src/game/q_shared.c	(Arbeitskopie)
@@ -887,7 +887,7 @@
  * @param[in] mins
  * @param[in] maxs
  */
-void ClearBounds (vec3_t mins, vec3_t maxs)
+void inline ClearBounds (vec3_t mins, vec3_t maxs)
 {
 	mins[0] = mins[1] = mins[2] = 99999;
 	maxs[0] = maxs[1] = maxs[2] = -99999;
@@ -920,7 +920,7 @@
  * @param[in] comp
  * @return qboolean
  */
-qboolean VectorNearer (const vec3_t v1, const vec3_t v2, const vec3_t comp)
+qboolean inline VectorNearer (const vec3_t v1, const vec3_t v2, const vec3_t comp)
 {
 	int i;

@@ -938,7 +938,7 @@
  * @sa VectorNormalize2
  * @return vector length as vec_t
  */
-vec_t VectorNormalize (vec3_t v)
+vec_t inline VectorNormalize (vec3_t v)
 {
 	float length, ilength;

@@ -964,7 +964,7 @@
  * @return vector length as vec_t
  * @sa CrossProduct
  */
-vec_t VectorNormalize2 (const vec3_t v, vec3_t out)
+vec_t inline VectorNormalize2 (const vec3_t v, vec3_t out)
 {
 	float length, ilength;

@@ -988,7 +988,7 @@
  * @param[in] vecb Movement direction
  * @param[out] vecc Target vector
  */
-void VectorMA (const vec3_t veca, const float scale, const vec3_t vecb, vec3_t vecc)
+void inline VectorMA (const vec3_t veca, const float scale, const vec3_t vecb, vec3_t vecc)
 {
 	vecc[0] = veca[0] + scale * vecb[0];
 	vecc[1] = veca[1] + scale * vecb[1];
@@ -1061,7 +1061,7 @@
  * @param
  * @sa GLMatrixMultiply
  */
-void MatrixMultiply (const vec3_t a[3], const vec3_t b[3], vec3_t c[3])
+void inline MatrixMultiply (const vec3_t a[3], const vec3_t b[3], vec3_t c[3])
 {
 	c[0][0] = a[0][0] * b[0][0] + a[1][0] * b[0][1] + a[2][0] * b[0][2];
 	c[0][1] = a[0][1] * b[0][0] + a[1][1] * b[0][1] + a[2][1] * b[0][2];
@@ -1113,7 +1113,7 @@
  * @param
  * @sa
  */
-void VectorRotate (const vec3_t m[3], const vec3_t va, vec3_t vb)
+void inline VectorRotate (const vec3_t m[3], const vec3_t va, vec3_t vb)
 {
 	vb[0] = m[0][0] * va[0] + m[1][0] * va[1] + m[2][0] * va[2];
 	vb[1] = m[0][1] * va[0] + m[1][1] * va[1] + m[2][1] * va[2];
@@ -1150,7 +1150,7 @@
  * @param[in] v2
  * @sa CrossProduct
  */
-vec_t _DotProduct (const vec3_t v1, const vec3_t v2)
+vec_t inline _DotProduct (const vec3_t v1, const vec3_t v2)
 {
 	return v1[0] * v2[0] + v1[1] * v2[1] + v1[2] * v2[2];
 }
@@ -1160,7 +1160,7 @@
  * @param
  * @sa _VectorAdd
  */
-void _VectorSubtract (const vec3_t veca, const vec3_t vecb, vec3_t out)
+void inline _VectorSubtract (const vec3_t veca, const vec3_t vecb, vec3_t out)
 {
 #ifdef UFO_MMX_ENABLED
 	/* raynorpat: msvc sse optimization */
@@ -1194,7 +1194,7 @@
  * @param[out] out The sum of the two vectors
  * @sa _VectorSubtract
  */
-void _VectorAdd (const vec3_t veca, const vec3_t vecb, vec3_t out)
+void inline _VectorAdd (const vec3_t veca, const vec3_t vecb, vec3_t out)
 {
 #ifdef UFO_MMX_ENABLED
 	/* raynorpat: msvc sse optimization */
@@ -1226,7 +1226,7 @@
  * @param
  * @sa
  */
-void _VectorCopy (const vec3_t in, vec3_t out)
+void inline _VectorCopy (const vec3_t in, vec3_t out)
 {
 #ifdef UFO_MMX_ENABLED
 	/* raynorpat: msvc sse optimization */
@@ -1264,7 +1264,7 @@
  * @sa DotProduct
  * @sa VectorNormalize2
  */
-void CrossProduct (const vec3_t v1, const vec3_t v2, vec3_t cross)
+void inline CrossProduct (const vec3_t v1, const vec3_t v2, vec3_t cross)
 {
 	cross[0] = v1[1] * v2[2] - v1[2] * v2[1];
 	cross[1] = v1[2] * v2[0] - v1[0] * v2[2];
@@ -1279,7 +1279,7 @@
  * @sa VectorNormalize
  * @return Vector length as vec_t
  */
-vec_t VectorLength (const vec3_t v)
+vec_t inline VectorLength (const vec3_t v)
 {
 	int i;
 	float length;
@@ -1297,7 +1297,7 @@
  * @param
  * @sa
  */
-void VectorInverse (vec3_t v)
+void inline VectorInverse (vec3_t v)
 {
 	v[0] = -v[0];
 	v[1] = -v[1];
@@ -1309,7 +1309,7 @@
  * @param
  * @sa
  */
-void VectorScale (const vec3_t in, const vec_t scale, vec3_t out)
+void inline VectorScale (const vec3_t in, const vec_t scale, vec3_t out)
 {
 #ifdef UFO_MMX_ENABLED
 	/* raynorpat: msvc sse optimization */
@@ -1342,7 +1342,7 @@
  * @param
  * @sa
  */
-int Q_log2 (int val)
+int inline Q_log2 (int val)
 {
 	int answer = 0;

@@ -1354,7 +1354,7 @@
 /**
   * @brief Return random values between 0 and 1
   */
-float frand (void)
+float inline frand (void)
 {
 	return (rand() & 32767) * (1.0 / 32767);
 }
@@ -1363,7 +1363,7 @@
 /**
   * @brief Return random values between -1 and 1
   */
-float crand (void)
+float inline crand (void)
 {
 	return (rand() & 32767) * (2.0 / 32767) - 1;
 }
@@ -1372,7 +1372,7 @@
  * @brief generate two gaussian distributed random numbers with median at 0 and stdev of 1
  * @param pointers to two floats that need to be set. both have to be provided.
  */
-void gaussrand (float *gauss1, float *gauss2)
+void inline gaussrand (float *gauss1, float *gauss2)
 {
 	float x1,x2,w,tmp;

Index: src/game/q_shared.h
===================================================================
--- src/game/q_shared.h	(Revision 9369)
+++ src/game/q_shared.h	(Arbeitskopie)
@@ -57,7 +57,7 @@
 #if defined _M_AMD64
 # pragma warning(disable : 4267) /* conversion from 'size_t' to whatever, possible loss of data */
 #endif
-
+#define inline __inline
 #endif /* _MSC_VER */

 #ifdef LCC_WIN32
Index: src/client/cl_sequence.c
===================================================================
--- src/client/cl_sequence.c	(Revision 9369)
+++ src/client/cl_sequence.c	(Arbeitskopie)
@@ -921,7 +921,7 @@
 /**
  * @brief
  */
-static void SafeFS_Write (const void *buffer, int len, qFILE * f)
+static inline void SafeFS_Write (const void *buffer, int len, qFILE * f)
 {
 	int write = FS_Write(buffer, len, f);

@@ -932,7 +932,7 @@
 /**
  * @brief
  */
-static void WRITE_STRING (const char *s)
+static inline void WRITE_STRING (const char *s)
 {
 	memcpy(&buffer[bufIndex], s, strlen(s));
 	bufIndex += strlen(s);
@@ -941,7 +941,7 @@
 /**
  * @brief
  */
-static void WRITE_4BYTES (int x)
+static inline void WRITE_4BYTES (int x)
 {
 	buffer[bufIndex + 0] = (byte) ((x >> 0) & 0xFF);
 	buffer[bufIndex + 1] = (byte) ((x >> 8) & 0xFF);
@@ -953,7 +953,7 @@
 /**
  * @brief
  */
-static void WRITE_2BYTES (int x)
+static inline void WRITE_2BYTES (int x)
 {
 	buffer[bufIndex + 0] = (byte) ((x >> 0) & 0xFF);
 	buffer[bufIndex + 1] = (byte) ((x >> 8) & 0xFF);
@@ -964,7 +964,7 @@
 /**
  * @brief
  */
-static void WRITE_1BYTES (int x)
+static inline void WRITE_1BYTES (int x)
 {
 	buffer[bufIndex] = x;
 	bufIndex += 1;
@@ -974,7 +974,7 @@
 /**
  * @brief
  */
-static void START_CHUNK (const char *s)
+static inline void START_CHUNK (const char *s)
 {
 	if (afd.chunkStackTop == MAX_RIFF_CHUNKS)
 		Sys_Error("ERROR: Top of chunkstack breached\n");
@@ -988,7 +988,7 @@
 /**
  * @brief
  */
-static void END_CHUNK (void)
+static inline void END_CHUNK (void)
 {
 	int endIndex = bufIndex;