diff --git a/winsup/testsuite/ChangeLog b/winsup/testsuite/ChangeLog
index 87e6f6973..8791f832a 100644
--- a/winsup/testsuite/ChangeLog
+++ b/winsup/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-23  Christopher Faylor  <cgf@redhat.com>
+
+	* winsup.api/mmaptest03.c (main): Mark variables as volatile to avoid
+	optimization induced problems.
+
 2003-01-23  Christopher Faylor  <cgf@redhat.com>
 
 	* Makefile (check): Add cygrun.exe dependency.
diff --git a/winsup/testsuite/winsup.api/mmaptest03.c b/winsup/testsuite/winsup.api/mmaptest03.c
index 5c871dbf2..2af191237 100644
--- a/winsup/testsuite/winsup.api/mmaptest03.c
+++ b/winsup/testsuite/winsup.api/mmaptest03.c
@@ -40,7 +40,7 @@ main(int argc, char **argv)
 {
   int fd, status;
   struct stat statbuf;
-  char c, *buf1, *buf2;
+  volatile char c, *buf1, *buf2;
   pid_t pid;
 
   /* Create data file */
@@ -96,7 +96,7 @@ main(int argc, char **argv)
   if (setjmp (r))
     perror_exit (pid ? "SEGV in parent's munmap" : "SEGV in child's munmap");
 
-  if (munmap(buf1, statbuf.st_size))
+  if (munmap((void *) buf1, statbuf.st_size))
     perror_exit (pid ? "munmap failed in parent" : "munmap failed in child");
 
   if (setjmp (r) == 0)
@@ -113,7 +113,7 @@ main(int argc, char **argv)
   if (setjmp (r))
     perror_exit (pid ? "SEGV in parent's munmap" : "SEGV in child's munmap");
 
-  if (munmap(buf2, statbuf.st_size))
+  if (munmap((void *) buf2, statbuf.st_size))
     perror_exit (pid ? "munmap failed in parent" : "munmap failed in child");
 
   if (pid)