diff --git a/library/changes b/library/changes
index 3d02e0a..4e42736 100644
--- a/library/changes
+++ b/library/changes
@@ -25,6 +25,12 @@
 - For %C strtime() should return the century number, not the
   year number mod 100.
 
+- The record locking code in fcntl() is no longer part of the
+  regular libc.a, but only of libunix.a.
+
+- Changed the definition of the D_S() macro to cast the pointer
+  address to an unsigned 32 bit integer.
+
 
 c.lib 1.192 (12.5.2005)
 
diff --git a/library/fcntl_fcntl.c b/library/fcntl_fcntl.c
index 7783a58..dee0647 100644
--- a/library/fcntl_fcntl.c
+++ b/library/fcntl_fcntl.c
@@ -1,5 +1,5 @@
 /*
- * $Id: fcntl_fcntl.c,v 1.17 2005-04-24 08:46:37 obarthel Exp $
+ * $Id: fcntl_fcntl.c,v 1.18 2005-05-27 13:19:30 obarthel Exp $
  *
  * :ts=4
  *
@@ -84,6 +84,7 @@ fcntl(int file_descriptor, int cmd, ... /* int arg */ )
 
 	switch(cmd)
 	{
+#if defined(UNIX_PATH_SEMANTICS)
 		case F_GETLK:
 		case F_SETLK:
 		case F_SETLKW:
@@ -133,6 +134,7 @@ fcntl(int file_descriptor, int cmd, ... /* int arg */ )
 			result = OK;
 
 			break;
+#endif /* UNIX_PATH_SEMANTICS */
 
 		case F_GETFL:
 
diff --git a/library/macros.h b/library/macros.h
index 56e66b7..5d7207c 100644
--- a/library/macros.h
+++ b/library/macros.h
@@ -1,5 +1,5 @@
 /*
- * $Id: macros.h,v 1.19 2005-03-18 12:38:22 obarthel Exp $
+ * $Id: macros.h,v 1.20 2005-05-27 13:19:30 obarthel Exp $
  *
  * :ts=4
  *
@@ -75,7 +75,7 @@
    char array allocated. */
 #define D_S(type, name) \
 	char a_##name[sizeof(type)+3]; \
-	type *name = (type *)((LONG)(a_##name+3) & ~3)
+	type *name = (type *)((ULONG)(a_##name+3) & ~3)
 
 /****************************************************************************/