diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 911263126..dad2d45da 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-06  Corinna Vinschen  <corinna@vinschen.de>
+
+	* include/cygwin/socket.h (CMSG_FIRSTHDR): Avoid compiler warning.
+
 2006-02-05  Corinna Vinschen  <corinna@vinschen.de>
 
 	* include/features.h: Add comment to explain what's going to happen
diff --git a/winsup/cygwin/include/cygwin/socket.h b/winsup/cygwin/include/cygwin/socket.h
index c977d08be..a3c55ae2e 100644
--- a/winsup/cygwin/include/cygwin/socket.h
+++ b/winsup/cygwin/include/cygwin/socket.h
@@ -85,7 +85,7 @@ struct cmsghdr
 #define CMSG_FIRSTHDR(mhdr)	\
 	({ \
 	  struct msghdr *_m = (struct msghdr *) mhdr; \
-	  (_m)->msg_controllen >= sizeof (struct cmsghdr) \
+	  (unsigned) (_m)->msg_controllen >= sizeof (struct cmsghdr) \
 	  ? (struct cmsghdr *) (_m)->msg_control \
 	  : (struct cmsghdr *) NULL; \
 	})