Fix warnings.

src/xpdev/xpbeep.c

@@ -74,9 +74,15 @@ static size_t sample_size;
 #endif
 
 static BOOL sound_device_open_failed=FALSE;
+#ifdef USE_ALSA_SOUND
 static BOOL alsa_device_open_failed=FALSE;
+#endif
+#ifdef WITH_SDL_AUDIO
 static BOOL sdl_device_open_failed=FALSE;
+#endif
+#ifdef WITH_PORTAUDIO
 static BOOL portaudio_device_open_failed=FALSE;
+#endif
 
 enum {
 	 SOUND_DEVICE_CLOSED
@@ -644,8 +650,15 @@ BOOL xptone_close(void)
 #endif
 	handle_type=SOUND_DEVICE_CLOSED;
 	sound_device_open_failed=FALSE;
+#ifdef USE_ALSA_SOUND
 	alsa_device_open_failed=FALSE;
+#endif
+#ifdef WITH_SDL_AUDIO
 	sdl_device_open_failed=FALSE;
+#endif
+#ifdef WITH_PORTAUDIO
+	portaudio_device_open_failed=FALSE;
+#endif
 
 	return(TRUE);
 }

src/xpdev/xpprintf.c

@@ -44,6 +44,7 @@
 #endif
 
 #include "xpprintf.h"
+#include "gen_defs.h"
 
 /* MSVC Sucks - can't tell the required len of a *printf() */
 #define MAX_ARG_LEN		1024			/* MAX_ARG_LEN is the maximum length
@@ -900,7 +901,7 @@ char *xp_asprintf_next(char *format, int type, ...)
 							ll=ld;
 							break;
 						case XP_PRINTF_TYPE_VOIDP:
-							ll=(long long)pntr;
+							ll=(long long)((intptr_t)pntr);
 							break;
 						case XP_PRINTF_TYPE_SIZET:
 							ll=s;
@@ -938,7 +939,7 @@ char *xp_asprintf_next(char *format, int type, ...)
 							ull=ld;
 							break;
 						case XP_PRINTF_TYPE_VOIDP:
-							ull=(unsigned long long int)pntr;
+							ull=(unsigned long long int)((uintptr_t)pntr);
 							break;
 						case XP_PRINTF_TYPE_SIZET:
 							ull=s;
@@ -1099,10 +1100,10 @@ char *xp_asprintf_next(char *format, int type, ...)
 							break;
 #if defined(XP_PRINTF_TYPE_LONGLONG)
 						case XP_PRINTF_TYPE_LONGLONG:
-							pntr=(void *)ll;
+							pntr=(void *)((intptr_t)ll);
 							break;
 						case XP_PRINTF_TYPE_ULONGLONG:
-							pntr=(void *)ull;
+							pntr=(void *)((uintptr_t)ull);
 							break;
 #endif
 						case XP_PRINTF_TYPE_CHARP: