diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog
index 826ced769..99b69a24e 100644
--- a/winsup/cygserver/ChangeLog
+++ b/winsup/cygserver/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-23  Corinna Vinschen  <corinna@vinschen.de>
+
+	* sysv_shm.cc (kern_shmat): Avoid compiler warning.
+
 2004-09-21  Corinna Vinschen  <corinna@vinschen.de>
 
 	* sysv_shm.cc (vm_object_reference): remove Cygwin specific define.
diff --git a/winsup/cygserver/sysv_shm.cc b/winsup/cygserver/sysv_shm.cc
index 02ad7001f..dc77103f5 100644
--- a/winsup/cygserver/sysv_shm.cc
+++ b/winsup/cygserver/sysv_shm.cc
@@ -334,11 +334,15 @@ kern_shmat(struct thread *td, int shmid, const void *shmaddr, int shmflg)
 	int i, flags;
 	struct shmid_ds *shmseg;
 	struct shmmap_state *shmmap_s = NULL;
+#ifndef __CYGWIN__
 	struct shm_handle *shm_handle;
+#endif
 	vm_offset_t attach_va;
 	vm_prot_t prot;
 	vm_size_t size;
+#ifndef __CYGWIN__
 	int rv;
+#endif
 	int error = 0;
 
 	if (!jail_sysvipc_allowed && jailed(td->td_ucred))