From 98a05abd051b2ad32ba227e7b2fa4dfbc733b728 Mon Sep 17 00:00:00 2001 From: Earnie Boyd Date: Wed, 5 Dec 2001 15:01:06 +0000 Subject: Merge MinGW CVS differences --- winsup/mingw/include/sys/locking.h | 6 +++--- winsup/mingw/include/sys/stat.h | 2 +- winsup/mingw/include/sys/timeb.h | 2 +- winsup/mingw/include/sys/types.h | 2 +- winsup/mingw/include/sys/utime.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'winsup/mingw/include/sys') diff --git a/winsup/mingw/include/sys/locking.h b/winsup/mingw/include/sys/locking.h index cf33b5f03..48e08e2c1 100644 --- a/winsup/mingw/include/sys/locking.h +++ b/winsup/mingw/include/sys/locking.h @@ -15,7 +15,7 @@ * * This code is distributed in the hope that it will be useful but * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAMED. This includes but is not limited to warranties of + * DISCLAIMED. This includes but is not limited to warranties of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * * $Revision$ @@ -32,14 +32,14 @@ /* All the headers include this file. */ #include <_mingw.h> -#define _LK_UNLOCK 0 /* Unlock */ +#define _LK_UNLCK 0 /* Unlock */ #define _LK_LOCK 1 /* Lock */ #define _LK_NBLCK 2 /* Non-blocking lock */ #define _LK_RLCK 3 /* Lock for read only */ #define _LK_NBRLCK 4 /* Non-blocking lock for read only */ #ifndef NO_OLDNAMES -#define LK_UNLOCK _LK_UNLOCK +#define LK_UNLCK _LK_UNLCK #define LK_LOCK _LK_LOCK #define LK_NBLCK _LK_NBLCK #define LK_RLCK _LK_RLCK diff --git a/winsup/mingw/include/sys/stat.h b/winsup/mingw/include/sys/stat.h index 47862105f..1620b0684 100644 --- a/winsup/mingw/include/sys/stat.h +++ b/winsup/mingw/include/sys/stat.h @@ -16,7 +16,7 @@ * * This code is distributed in the hope that it will be useful but * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAMED. This includes but is not limited to warranties of + * DISCLAIMED. This includes but is not limited to warranties of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * * $Revision$ diff --git a/winsup/mingw/include/sys/timeb.h b/winsup/mingw/include/sys/timeb.h index 696a33404..201116275 100644 --- a/winsup/mingw/include/sys/timeb.h +++ b/winsup/mingw/include/sys/timeb.h @@ -15,7 +15,7 @@ * * This code is distributed in the hope that it will be useful but * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAMED. This includes but is not limited to warranties of + * DISCLAIMED. This includes but is not limited to warranties of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * * $Revision$ diff --git a/winsup/mingw/include/sys/types.h b/winsup/mingw/include/sys/types.h index dce11f51d..76c3d8dc3 100644 --- a/winsup/mingw/include/sys/types.h +++ b/winsup/mingw/include/sys/types.h @@ -16,7 +16,7 @@ * * This code is distributed in the hope that it will be useful but * WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAMED. This includes but is not limited to warrenties of + * DISCLAIMED. This includes but is not limited to warrenties of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * * $Revision$ diff --git a/winsup/mingw/include/sys/utime.h b/winsup/mingw/include/sys/utime.h index 59d00fe2c..7c907f32a 100644 --- a/winsup/mingw/include/sys/utime.h +++ b/winsup/mingw/include/sys/utime.h @@ -15,7 +15,7 @@ * * This code is distributed in the hope that it will be useful but * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAMED. This includes but is not limited to warranties of + * DISCLAIMED. This includes but is not limited to warranties of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * * $Revision$ -- cgit v1.2.3