diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 854ddbd1f..3b91457c2 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2003-10-09  Yitzchak Scott-Thoennes <sthoenna@efn.org>
+
+	* include/sys/mman.h (MAP_FAILED): Define as void *.
+
 2003-10-08  Christopher Faylor  <cgf@redhat.com>
 
 	* dcrt0.cc (hMainProc): Initialize to useful value for use when dll is
diff --git a/winsup/cygwin/include/sys/mman.h b/winsup/cygwin/include/sys/mman.h
index 13393e9cc..3264739c0 100644
--- a/winsup/cygwin/include/sys/mman.h
+++ b/winsup/cygwin/include/sys/mman.h
@@ -31,7 +31,7 @@ extern "C" {
 #define MAP_ANONYMOUS 0x20
 #define MAP_ANON MAP_ANONYMOUS
 
-#define MAP_FAILED ((caddr_t)-1)
+#define MAP_FAILED ((void *)-1)
 
 /*
  * Flags for msync.