diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index a0ff828c1..edf43778d 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-25  Christopher Faylor  <cgf@alum.bu.edu>
+
+	* winbase.h: Semi-revert previous patch as it caused strange behavior.
+	Use syntax similar to that recommended in mingw-dvlpr.
+
 2004-05-25  Christopher Faylor  <cgf@alum.bu.edu>
 
 	* include/cygwin/version.h: Bump DLL minor number to 11.
diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
index 83cc97ebc..d171f40f1 100644
--- a/winsup/cygwin/include/cygwin/version.h
+++ b/winsup/cygwin/include/cygwin/version.h
@@ -42,7 +42,7 @@ details. */
 	 changes to the DLL and is mainly informative in nature. */
 
 #define CYGWIN_VERSION_DLL_MAJOR 1005
-#define CYGWIN_VERSION_DLL_MINOR 11
+#define CYGWIN_VERSION_DLL_MINOR 10
 
       /* Major numbers before CYGWIN_VERSION_DLL_EPOCH are
 	 incompatible. */
diff --git a/winsup/cygwin/winbase.h b/winsup/cygwin/winbase.h
index 3b645e50b..3d1f202ec 100644
--- a/winsup/cygwin/winbase.h
+++ b/winsup/cygwin/winbase.h
@@ -11,7 +11,7 @@ ilockincr (long *m)
 	movl	$1,%0\n\
 	lock	xadd %0,%1\n\
 	inc	%0\n\
-	": "=a" (__res), "+m" (m): : "memory", "cc");
+	": "=a" (__res), "+m" (*m): : "cc");
   return __res;
 }
 
@@ -23,7 +23,7 @@ ilockdecr (long *m)
 	movl	$0xffffffff,%0\n\
 	lock	xadd %0,%1\n\
 	dec	%0\n\
-	": "=a" (__res), "+m" (m): : "memory", "cc");
+	": "=a" (__res), "+m" (*m):  : "cc");
   return __res;
 }
 
@@ -34,7 +34,7 @@ ilockexch (long *t, long v)
   __asm__ __volatile__ ("\n\
 1:	lock	cmpxchgl %3,(%1)\n\
 	jne 1b\n\
- 	": "=a" (__res), "=q" (t): "1" (t), "q" (v), "0" (*t): "memory", "cc");
+ 	": "=a" (__res), "=q" (t): "1" (t), "q" (v), "0" (*t): "cc");
   return __res;
 }
 
@@ -44,7 +44,7 @@ ilockcmpexch (long *t, long v, long c)
   register int __res;
   __asm__ __volatile__ ("\n\
 	lock cmpxchgl %3,(%1)\n\
-	": "=a" (__res), "=q" (t) : "1" (t), "q" (v), "0" (c): "memory", "cc");
+	": "=a" (__res), "=q" (t) : "1" (t), "q" (v), "0" (c): "cc");
   return __res;
 }