diff --git a/programs/sndfile-play.c b/programs/sndfile-play.c
index 40d37349..cd5cc278 100644
--- a/programs/sndfile-play.c
+++ b/programs/sndfile-play.c
@@ -509,7 +509,8 @@ win32_play_data (Win32_Audio_Data *audio_data)
 	/* fill a buffer if there is more data and we can read it sucessfully */
 	readcount = (audio_data->remaining > audio_data->bufferlen) ? audio_data->bufferlen : (int) audio_data->remaining ;
 
-	thisread = (int) sf_read_short (audio_data->sndfile, (short *) (audio_data->whdr [audio_data->current].lpData), readcount) ;
+	short *lpData = (short *) (void *) audio_data->whdr [audio_data->current].lpData ;
+	thisread = (int) sf_read_short (audio_data->sndfile, lpData, readcount) ;
 
 	audio_data->remaining -= thisread ;
 
diff --git a/tests/pcm_test.tpl b/tests/pcm_test.tpl
index 4658f1b5..11226fb9 100644
--- a/tests/pcm_test.tpl
+++ b/tests/pcm_test.tpl
@@ -692,14 +692,7 @@ pcm_test_double (const char *filename, int	filetype, uint64_t hash, int replace_
 
 	sf_close (file) ;
 
-#if (defined (WIN32) || defined (_WIN32))
-	/* File hashing on Win32 fails due to slighty different
-	** calculated values of the sin() function.
-	*/
-	hash = hash ; /* Avoid compiler warning. */
-#else
 	check_file_hash_or_die (filename, hash, __LINE__) ;
-#endif
 
 	memset (data, 0, items * sizeof (double)) ;
 
@@ -826,14 +819,7 @@ pcm_test_double (const char *filename, int	filetype, uint64_t hash, int replace_
 
 	sf_close (file) ;
 
-#if (defined (WIN32) || defined (_WIN32))
-	/* File hashing on Win32 fails due to slighty different
-	** calculated values.
-	*/
-	hash = hash ; /* Avoid compiler warning. */
-#else
 	check_file_hash_or_die (filename, hash, __LINE__) ;
-#endif
 
 	memset (data, 0, items * sizeof (double)) ;