source: clfs-embedded/patches/uClibc-0.9.30-rc3-flock_fixes-1.patch@ 3c8eaa6

Last change on this file since 3c8eaa6 was 2567553, checked in by Joe Ciccone <jciccone@…>, 16 years ago

Updated Busybox to 1.12.1.
Patched uClibc so struct flock doesn't get redefined.
  • Property mode set to 100644
File size: 22.3 KB

  • libc/sysdeps/linux/alpha/bits/fcntl.h 

    diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/alpha/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/alpha/bits/fcntl.h
    old new  
    138138# define DN_MULTISHOT   0x80000000      /* Don't remove notifier.  */
    139139#endif
    140140
     141#ifndef HAVE_ARCH_STRUCT_FLOCK
    141142/* We don't need to support __USE_FILE_OFFSET64.  */
    142143struct flock
    143144  {
    … …  
    147148    __off_t l_len;      /* Size of the locked area; zero means until EOF.  */
    148149    __pid_t l_pid;      /* Process holding the lock.  */
    149150  };
     151#endif
    150152
     153#ifndef HAVE_ARCH_STRUCT_FLOCK64
    151154#ifdef __USE_LARGEFILE64
    152155struct flock64
    153156  {
    … …  
    158161    __pid_t l_pid;      /* Process holding the lock.  */
    159162  };
    160163#endif
     164#endif
    161165
    162166
    163167/* Define some more compatibility macros to be backward compatible with

  • libc/sysdeps/linux/arm/bits/fcntl.h 

    diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/arm/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/arm/bits/fcntl.h
    old new  
    143143# define DN_MULTISHOT   0x80000000      /* Don't remove notifier.  */
    144144#endif
    145145
     146#ifndef HAVE_ARCH_STRUCT_FLOCK
    146147struct flock
    147148  {
    148149    short int l_type;   /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
    … …  
    156157#endif
    157158    __pid_t l_pid;      /* Process holding the lock.  */
    158159  };
     160#endif
    159161
     162#ifndef HAVE_ARCH_STRUCT_FLOCK64
    160163#ifdef __USE_LARGEFILE64
    161164struct flock64
    162165  {
    … …  
    167170    __pid_t l_pid;      /* Process holding the lock.  */
    168171  };
    169172#endif
     173#endif
    170174
    171175/* Define some more compatibility macros to be backward compatible with
    172176   BSD systems which did not managed to hide these kernel macros.  */

  • libc/sysdeps/linux/avr32/bits/fcntl.h 

    diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/avr32/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/avr32/bits/fcntl.h
    old new  
    124124# define DN_MULTISHOT   0x80000000      /* Don't remove notifier.  */
    125125#endif
    126126
     127#ifndef HAVE_ARCH_STRUCT_FLOCK
    127128struct flock {
    128129        short           l_type;
    129130        short           l_whence;
    … …  
    136137#endif
    137138        __pid_t         l_pid;
    138139};
     140#endif
    139141
     142#ifndef HAVE_ARCH_STRUCT_FLOCK64
    140143#ifdef __USE_LARGEFILE64
    141144struct flock64 {
    142145        short           l_type;
    … …  
    146149        __pid_t         l_pid;
    147150};
    148151#endif
     152#endif
    149153
    150154/* Define some more compatibility macros to be backward compatible with
    151155 *    BSD systems which did not managed to hide these kernel macros.  */

  • libc/sysdeps/linux/bfin/bits/fcntl.h 

    diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/bfin/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/bfin/bits/fcntl.h
    old new  
    139139# define DN_MULTISHOT   0x80000000      /* Don't remove notifier.  */
    140140#endif
    141141
     142#ifndef HAVE_ARCH_STRUCT_FLOCK
    142143struct flock
    143144  {
    144145    short int l_type;   /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
    … …  
    152153#endif
    153154    __pid_t l_pid;      /* Process holding the lock.  */
    154155  };
     156#endif
    155157
     158#ifndef HAVE_ARCH_STRUCT_FLOCK64
    156159#ifdef __USE_LARGEFILE64
    157160struct flock64
    158161  {
    … …  
    163166    __pid_t l_pid;      /* Process holding the lock.  */
    164167  };
    165168#endif
     169#endif
    166170
    167171/* Define some more compatibility macros to be backward compatible with
    168172   BSD systems which did not managed to hide these kernel macros.  */

  • libc/sysdeps/linux/cris/bits/fcntl.h 

    diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/cris/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/cris/bits/fcntl.h
    old new  
    140140# define DN_MULTISHOT   0x80000000      /* Don't remove notifier.  */
    141141#endif
    142142
     143#ifndef HAVE_ARCH_STRUCT_FLOCK
    143144struct flock
    144145  {
    145146    short int l_type;   /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
    … …  
    153154#endif
    154155    __pid_t l_pid;      /* Process holding the lock.  */
    155156  };
     157#endif
    156158
     159#ifndef HAVE_ARCH_STRUCT_FLOCK64
    157160#ifdef __USE_LARGEFILE64
    158161struct flock64
    159162  {
    … …  
    164167    __pid_t l_pid;      /* Process holding the lock.  */
    165168  };
    166169#endif
     170#endif
    167171
    168172/* Define some more compatibility macros to be backward compatible with
    169173   BSD systems which did not managed to hide these kernel macros.  */

  • libc/sysdeps/linux/e1/bits/fcntl.h 

    diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/e1/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/e1/bits/fcntl.h
    old new  
    136136# define DN_MULTISHOT   0x80000000      /* Don't remove notifier.  */
    137137#endif
    138138
     139#ifndef HAVE_ARCH_STRUCT_FLOCK
    139140struct flock
    140141  {
    141142    short int l_type;   /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
    … …  
    149150#endif
    150151    __pid_t l_pid;      /* Process holding the lock.  */
    151152  };
     153#endif
    152154
     155#ifndef HAVE_ARCH_STRUCT_FLOCK64
    153156#ifdef __USE_LARGEFILE64
    154157struct flock64
    155158  {
    … …  
    160163    __pid_t l_pid;      /* Process holding the lock.  */
    161164  };
    162165#endif
     166#endif
    163167
    164168/* Define some more compatibility macros to be backward compatible with
    165169   BSD systems which did not managed to hide these kernel macros.  */

  • libc/sysdeps/linux/frv/bits/fcntl.h 

    diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/frv/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/frv/bits/fcntl.h
    old new  
    118118# define LOCK_UN        8       /* remove lock */
    119119#endif
    120120
     121#ifndef HAVE_ARCH_STRUCT_FLOCK
    121122struct flock
    122123  {
    123124    short int l_type;   /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
    … …  
    131132#endif
    132133    __pid_t l_pid;      /* Process holding the lock.  */
    133134  };
     135#endif
    134136
     137#ifndef HAVE_ARCH_STRUCT_FLOCK64
    135138#ifdef __USE_LARGEFILE64
    136139struct flock64
    137140  {
    … …  
    142145    __pid_t l_pid;      /* Process holding the lock.  */
    143146  };
    144147#endif
     148#endif
    145149
    146150/* Define some more compatibility macros to be backward compatible with
    147151   BSD systems which did not managed to hide these kernel macros.  */

  • libc/sysdeps/linux/h8300/bits/fcntl.h 

    diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/h8300/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/h8300/bits/fcntl.h
    old new  
    136136# define DN_MULTISHOT   0x80000000      /* Don't remove notifier.  */
    137137#endif
    138138
     139#ifndef HAVE_ARCH_STRUCT_FLOCK
    139140struct flock
    140141  {
    141142    short int l_type;   /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
    … …  
    149150#endif
    150151    __pid_t l_pid;      /* Process holding the lock.  */
    151152  };
     153#endif
    152154
     155#ifndef HAVE_ARCH_STRUCT_FLOCK64
    153156#ifdef __USE_LARGEFILE64
    154157struct flock64
    155158  {
    … …  
    160163    __pid_t l_pid;      /* Process holding the lock.  */
    161164  };
    162165#endif
     166#endif
    163167
    164168/* Define some more compatibility macros to be backward compatible with
    165169   BSD systems which did not managed to hide these kernel macros.  */

  • libc/sysdeps/linux/hppa/bits/fcntl.h 

    diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/hppa/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/hppa/bits/fcntl.h
    old new  
    130130# define DN_MULTISHOT   0x80000000      /* Don't remove notifier.  */
    131131#endif
    132132
     133#ifndef HAVE_ARCH_STRUCT_FLOCK
    133134struct flock
    134135  {
    135136    short int l_type;   /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
    … …  
    143144#endif
    144145    __pid_t l_pid;      /* Process holding the lock.  */
    145146  };
     147#endif
    146148
     149#ifndef HAVE_ARCH_STRUCT_FLOCK64
    147150#ifdef __USE_LARGEFILE64
    148151struct flock64
    149152  {
    … …  
    154157    __pid_t l_pid;      /* Process holding the lock.  */
    155158  };
    156159#endif
     160#endif
    157161
    158162/* Define some more compatibility macros to be backward compatible with
    159163   BSD systems which did not managed to hide these kernel macros.  */

  • libc/sysdeps/linux/i386/bits/fcntl.h 

    diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/i386/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/i386/bits/fcntl.h
    old new  
    143143# define DN_MULTISHOT   0x80000000      /* Don't remove notifier.  */
    144144#endif
    145145
     146#ifndef HAVE_ARCH_STRUCT_FLOCK
    146147struct flock
    147148  {
    148149    short int l_type;   /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
    … …  
    156157#endif
    157158    __pid_t l_pid;      /* Process holding the lock.  */
    158159  };
     160#endif
    159161
     162#ifndef HAVE_ARCH_STRUCT_FLOCK64
    160163#ifdef __USE_LARGEFILE64
    161164struct flock64
    162165  {
    … …  
    167170    __pid_t l_pid;      /* Process holding the lock.  */
    168171  };
    169172#endif
     173#endif
    170174
    171175/* Define some more compatibility macros to be backward compatible with
    172176   BSD systems which did not managed to hide these kernel macros.  */

  • libc/sysdeps/linux/i960/bits/fcntl.h 

    diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/i960/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/i960/bits/fcntl.h
    old new  
    136136# define DN_MULTISHOT   0x80000000      /* Don't remove notifier.  */
    137137#endif
    138138
     139#ifndef HAVE_ARCH_STRUCT_FLOCK
    139140struct flock
    140141  {
    141142    short int l_type;   /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
    … …  
    149150#endif
    150151    __pid_t l_pid;      /* Process holding the lock.  */
    151152  };
     153#endif
    152154
     155#ifndef HAVE_ARCH_STRUCT_FLOCK64
    153156#ifdef __USE_LARGEFILE64
    154157struct flock64
    155158  {
    … …  
    160163    __pid_t l_pid;      /* Process holding the lock.  */
    161164  };
    162165#endif
     166#endif
    163167
    164168/* Define some more compatibility macros to be backward compatible with
    165169   BSD systems which did not managed to hide these kernel macros.  */

  • libc/sysdeps/linux/ia64/bits/fcntl.h 

    diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/ia64/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/ia64/bits/fcntl.h
    old new  
    140140# define DN_MULTISHOT   0x80000000      /* Don't remove notifier.  */
    141141#endif
    142142
     143#ifndef HAVE_ARCH_STRUCT_FLOCK
    143144/* We don't need to support __USE_FILE_OFFSET64.  */
    144145struct flock
    145146  {
    … …  
    149150    __off_t l_len;      /* Size of the locked area; zero means until EOF.  */
    150151    __pid_t l_pid;      /* Process holding the lock.  */
    151152  };
     153#endif
    152154
     155#ifndef HAVE_ARCH_STRUCT_FLOCK64
    153156#ifdef __USE_LARGEFILE64
    154157struct flock64
    155158  {
    … …  
    160163    __pid_t l_pid;      /* Process holding the lock.  */
    161164  };
    162165#endif
     166#endif
    163167
    164168
    165169/* Define some more compatibility macros to be backward compatible with

  • libc/sysdeps/linux/m68k/bits/fcntl.h 

    diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/m68k/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/m68k/bits/fcntl.h
    old new  
    139139# define DN_MULTISHOT   0x80000000      /* Don't remove notifier.  */
    140140#endif
    141141
     142#ifndef HAVE_ARCH_STRUCT_FLOCK
    142143struct flock
    143144  {
    144145    short int l_type;   /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
    … …  
    152153#endif
    153154    __pid_t l_pid;      /* Process holding the lock.  */
    154155  };
     156#endif
    155157
     158#ifndef HAVE_ARCH_STRUCT_FLOCK64
    156159#ifdef __USE_LARGEFILE64
    157160struct flock64
    158161  {
    … …  
    163166    __pid_t l_pid;      /* Process holding the lock.  */
    164167  };
    165168#endif
     169#endif
    166170
    167171/* Define some more compatibility macros to be backward compatible with
    168172   BSD systems which did not managed to hide these kernel macros.  */

  • libc/sysdeps/linux/microblaze/bits/fcntl.h 

    diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/microblaze/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/microblaze/bits/fcntl.h
    old new  
    136136# define DN_MULTISHOT   0x80000000      /* Don't remove notifier.  */
    137137#endif
    138138
     139#ifndef HAVE_ARCH_STRUCT_FLOCK
    139140struct flock
    140141  {
    141142    short int l_type;   /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
    … …  
    149150#endif
    150151    __pid_t l_pid;      /* Process holding the lock.  */
    151152  };
     153#endif
    152154
     155#ifndef HAVE_ARCH_STRUCT_FLOCK64
    153156#ifdef __USE_LARGEFILE64
    154157struct flock64
    155158  {
    … …  
    160163    __pid_t l_pid;      /* Process holding the lock.  */
    161164  };
    162165#endif
     166#endif
    163167
    164168/* Define some more compatibility macros to be backward compatible with
    165169   BSD systems which did not managed to hide these kernel macros.  */

  • libc/sysdeps/linux/mips/bits/fcntl.h 

    diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/mips/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/mips/bits/fcntl.h
    old new  
    152152# define DN_MULTISHOT   0x80000000      /* Don't remove notifier.  */
    153153#endif
    154154
     155#ifndef HAVE_ARCH_STRUCT_FLOCK
    155156struct flock
    156157  {
    157158    short int l_type;   /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
    … …  
    176177#endif
    177178  };
    178179typedef struct flock flock_t;
     180#endif
    179181
     182#ifndef HAVE_ARCH_STRUCT_FLOCK64
    180183#ifdef __USE_LARGEFILE64
    181184struct flock64
    182185  {
    … …  
    187190    __pid_t l_pid;      /* Process holding the lock.  */
    188191  };
    189192#endif
     193#endif
    190194
    191195/* Define some more compatibility macros to be backward compatible with
    192196   BSD systems which did not managed to hide these kernel macros.  */

  • libc/sysdeps/linux/nios/bits/fcntl.h 

    diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/nios/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/nios/bits/fcntl.h
    old new  
    139139# define DN_MULTISHOT   0x80000000      /* Don't remove notifier.  */
    140140#endif
    141141
     142#ifndef HAVE_ARCH_STRUCT_FLOCK
    142143struct flock
    143144  {
    144145    short int l_type;   /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
    … …  
    152153#endif
    153154    __pid_t l_pid;      /* Process holding the lock.  */
    154155  };
     156#endif
    155157
     158#ifndef HAVE_ARCH_STRUCT_FLOCK64
    156159#ifdef __USE_LARGEFILE64
    157160struct flock64
    158161  {
    … …  
    163166    __pid_t l_pid;      /* Process holding the lock.  */
    164167  };
    165168#endif
     169#endif
    166170
    167171/* Define some more compatibility macros to be backward compatible with
    168172   BSD systems which did not managed to hide these kernel macros.  */

  • libc/sysdeps/linux/nios2/bits/fcntl.h 

    diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/nios2/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/nios2/bits/fcntl.h
    old new  
    139139# define DN_MULTISHOT   0x80000000      /* Don't remove notifier.  */
    140140#endif
    141141
     142#ifndef HAVE_ARCH_STRUCT_FLOCK
    142143struct flock
    143144  {
    144145    short int l_type;   /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
    … …  
    152153#endif
    153154    __pid_t l_pid;      /* Process holding the lock.  */
    154155  };
     156#endif
    155157
     158#ifndef HAVE_ARCH_STRUCT_FLOCK64
    156159#ifdef __USE_LARGEFILE64
    157160struct flock64
    158161  {
    … …  
    163166    __pid_t l_pid;      /* Process holding the lock.  */
    164167  };
    165168#endif
     169#endif
    166170
    167171/* Define some more compatibility macros to be backward compatible with
    168172   BSD systems which did not managed to hide these kernel macros.  */

  • libc/sysdeps/linux/sh/bits/fcntl.h 

    diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/sh/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/sh/bits/fcntl.h
    old new  
    143143# define DN_MULTISHOT   0x80000000      /* Don't remove notifier.  */
    144144#endif
    145145
     146#ifndef HAVE_ARCH_STRUCT_FLOCK
    146147struct flock
    147148  {
    148149    short int l_type;   /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
    … …  
    156157#endif
    157158    __pid_t l_pid;      /* Process holding the lock.  */
    158159  };
     160#endif
    159161
     162#ifndef HAVE_ARCH_STRUCT_FLOCK64
    160163#ifdef __USE_LARGEFILE64
    161164struct flock64
    162165  {
    … …  
    167170    __pid_t l_pid;      /* Process holding the lock.  */
    168171  };
    169172#endif
     173#endif
    170174
    171175/* Define some more compatibility macros to be backward compatible with
    172176   BSD systems which did not managed to hide these kernel macros.  */

  • libc/sysdeps/linux/sh64/bits/fcntl.h 

    diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/sh64/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/sh64/bits/fcntl.h
    old new  
    118118# define LOCK_UN        8       /* remove lock */
    119119#endif
    120120
     121#ifndef HAVE_ARCH_STRUCT_FLOCK
    121122struct flock
    122123  {
    123124    short int l_type;   /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
    … …  
    131132#endif
    132133    __pid_t l_pid;      /* Process holding the lock.  */
    133134  };
     135#endif
    134136
     137#ifndef HAVE_ARCH_STRUCT_FLOCK64
    135138#ifdef __USE_LARGEFILE64
    136139struct flock64
    137140  {
    … …  
    142145    __pid_t l_pid;      /* Process holding the lock.  */
    143146  };
    144147#endif
     148#endif
    145149
    146150/* Define some more compatibility macros to be backward compatible with
    147151   BSD systems which did not managed to hide these kernel macros.  */

  • libc/sysdeps/linux/sparc/bits/fcntl.h 

    diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/sparc/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/sparc/bits/fcntl.h
    old new  
    160160# define DN_MULTISHOT   0x80000000      /* Don't remove notifier.  */
    161161#endif
    162162
     163#ifndef HAVE_ARCH_STRUCT_FLOCK
    163164struct flock
    164165  {
    165166    short int l_type;   /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
    … …  
    174175    __pid_t l_pid;      /* Process holding the lock.  */
    175176    short int __unused;
    176177  };
     178#endif
    177179
     180#ifndef HAVE_ARCH_STRUCT_FLOCK64
    178181#ifdef __USE_LARGEFILE64
    179182struct flock64
    180183  {
    … …  
    186189    short int __unused;
    187190  };
    188191#endif
     192#endif
    189193
    190194/* Define some more compatibility macros to be backward compatible with
    191195   BSD systems which did not managed to hide these kernel macros.  */

  • libc/sysdeps/linux/v850/bits/fcntl.h 

    diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/v850/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/v850/bits/fcntl.h
    old new  
    136136# define DN_MULTISHOT   0x80000000      /* Don't remove notifier.  */
    137137#endif
    138138
     139#ifndef HAVE_ARCH_STRUCT_FLOCK
    139140struct flock
    140141  {
    141142    short int l_type;   /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
    … …  
    149150#endif
    150151    __pid_t l_pid;      /* Process holding the lock.  */
    151152  };
     153#endif
    152154
     155#ifndef HAVE_ARCH_STRUCT_FLOCK64
    153156#ifdef __USE_LARGEFILE64
    154157struct flock64
    155158  {
    … …  
    160163    __pid_t l_pid;      /* Process holding the lock.  */
    161164  };
    162165#endif
     166#endif
    163167
    164168/* Define some more compatibility macros to be backward compatible with
    165169   BSD systems which did not managed to hide these kernel macros.  */

  • libc/sysdeps/linux/vax/bits/fcntl.h 

    diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/vax/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/vax/bits/fcntl.h
    old new  
    116116# define LOCK_UN        8       /* remove lock */
    117117#endif
    118118
     119#ifndef HAVE_ARCH_STRUCT_FLOCK
    119120struct flock
    120121  {
    121122    short int l_type;   /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
    … …  
    129130#endif
    130131    __pid_t l_pid;      /* Process holding the lock.  */
    131132  };
     133#endif
    132134
     135#ifndef HAVE_ARCH_STRUCT_FLOCK64
    133136#ifdef __USE_LARGEFILE64
    134137struct flock64
    135138  {
    … …  
    140143    __pid_t l_pid;      /* Process holding the lock.  */
    141144  };
    142145#endif
     146#endif
    143147
    144148/* Define some more compatibility macros to be backward compatible with
    145149   BSD systems which did not managed to hide these kernel macros.  */

  • libc/sysdeps/linux/x86_64/bits/fcntl.h 

    diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/x86_64/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/x86_64/bits/fcntl.h
    old new  
    157157# define DN_MULTISHOT   0x80000000      /* Don't remove notifier.  */
    158158#endif
    159159
     160#ifndef HAVE_ARCH_STRUCT_FLOCK
    160161struct flock
    161162  {
    162163    short int l_type;   /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
    … …  
    170171#endif
    171172    __pid_t l_pid;      /* Process holding the lock.  */
    172173  };
     174#endif
    173175
     176#ifndef HAVE_ARCH_STRUCT_FLOCK64
    174177#ifdef __USE_LARGEFILE64
    175178struct flock64
    176179  {
    … …  
    181184    __pid_t l_pid;      /* Process holding the lock.  */
    182185  };
    183186#endif
     187#endif
    184188
    185189/* Define some more compatibility macros to be backward compatible with
    186190   BSD systems which did not managed to hide these kernel macros.  */

  • libc/sysdeps/linux/xtensa/bits/fcntl.h 

    diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/xtensa/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/xtensa/bits/fcntl.h
    old new  
    140140# define DN_MULTISHOT   0x80000000      /* Don't remove notifier.  */
    141141#endif
    142142
     143#ifndef HAVE_ARCH_STRUCT_FLOCK
    143144struct flock
    144145  {
    145146    short int l_type;   /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
    … …  
    153154#endif
    154155    __pid_t l_pid;      /* Process holding the lock.  */
    155156  };
     157#endif
    156158
     159#ifndef HAVE_ARCH_STRUCT_FLOCK64
    157160#ifdef __USE_LARGEFILE64
    158161struct flock64
    159162  {
    … …  
    164167    __pid_t l_pid;      /* Process holding the lock.  */
    165168  };
    166169#endif
     170#endif
    167171
    168172/* Define some more compatibility macros to be backward compatible with
    169173   BSD systems which did not managed to hide these kernel macros.  */
Note: See TracBrowser for help on using the repository browser.