X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cd_win.c;h=ec94e560831e9d3b0ef38faed905c2f50d478536;hb=da42c657f8671a1d44463763607e64a00087af94;hp=913aec31e4681488c5193632486d3f6692618d9f;hpb=f9efec5d9bd92a5b614aab549f8b0a009051fbbc;p=xonotic%2Fdarkplaces.git

diff --git a/cd_win.c b/cd_win.c
index 913aec31..ec94e560 100644
--- a/cd_win.c
+++ b/cd_win.c
@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "cdaudio.h"
 
-#if _MSC_VER < 1300
+#if defined(_MSC_VER) && (_MSC_VER < 1300)
 typedef DWORD DWORD_PTR;
 #endif
 
@@ -93,7 +93,7 @@ float CDAudio_SysGetVolume (void)
 }
 
 
-void CDAudio_SysSetVolume (float volume)
+void CDAudio_SysSetVolume (float fvolume)
 {
 	// IMPLEMENTME
 }
@@ -218,7 +218,7 @@ LONG CDAudio_MessageHandler (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 			break;
 
 		default:
-			Con_Printf("Unexpected MM_MCINOTIFY type (%i)\n", wParam);
+			Con_Printf("Unexpected MM_MCINOTIFY type (%i)\n", (int)wParam);
 			return 1;
 	}