Annotation of pkgsrc/sysutils/lsof/patches/patch-ac, revision 1.8

1.8     ! atatat      1: $NetBSD$
1.1       bad         2: 
1.8     ! atatat      3: --- dialects/n+obsd/dlsof.h.orig       2003-03-23 14:51:12.000000000 -0500
        !             4: +++ dialects/n+obsd/dlsof.h
        !             5: @@ -73,7 +73,17 @@ struct buf; /* dummy for function protot
        !             6:  
        !             7:  #define       NFS
        !             8:  #define m_stat        mnt_stat
        !             9: +
        !            10: +# if  defined(NETBSDV) && __NetBSD_Version__>=106060000
        !            11: +#define       _KERNEL
        !            12: +# endif       /* defined(NETBSDV) && __NetBSD_Version__>=106060000 */
        !            13: +
        !            14:  #include <sys/mount.h>
        !            15: +
        !            16: +# if  defined(NETBSDV) && __NetBSD_Version__>=106060000
        !            17: +#undef        _KERNEL
        !            18: +# endif       /* defined(NETBSDV) && __NetBSD_Version__>=106060000 */
        !            19: +
        !            20:  #include <rpc/types.h>
        !            21:  #include <sys/protosw.h>
        !            22:  
        !            23: @@ -87,6 +97,7 @@ struct buf;  /* dummy for function protot
        !            24:  #include <msdosfs/bpb.h>
        !            25:  #include <msdosfs/fat.h>
        !            26:  
        !            27: +#  if defined(OPENBSDV) || (defined(NETBSDV) && __NetBSD_Version__<106060000)
        !            28:  /*
        !            29:   * As a terrible hack, the lsof Configure script extracts the netcred and
        !            30:   * netexport structure definitions from <sys/mount.h> and places them in
        !            31: @@ -100,9 +111,14 @@ struct buf;       /* dummy for function protot
        !            32:   *
        !            33:   * THIS IS A TERRIBLE AND FRAGILE HACK!!!  It might break if the netexport or
        !            34:   * netcred definitions change radically in <sys/mount.h>.
        !            35: + *
        !            36: + * It is no longer needed for NetBSD Versions 1.6F and above.
        !            37:   */
        !            38:  
        !            39:  #include "netexport.h"
        !            40: +#  endif      /* defined(OPENBSDV) 
        !            41: +                 || (defined(NETBSDV) && __NetBSD_Version__<106060000) */
        !            42: +
        !            43:  #define       _KERNEL
        !            44:  struct nameidata;     /* to satisfy a function prototype in msdosfsmount.h */
        !            45:  #include <msdosfs/msdosfsmount.h>
        !            46: @@ -178,6 +194,12 @@ struct sockproto {
        !            47:  #undef        DIRBLKSIZ
        !            48:  # endif       /* defined(DIRBLKSIZ) */
        !            49:  
        !            50: +# if  defined(HASI_FFS1)
        !            51: +#define       _KERNEL
        !            52: +#include <ufs/ufs/ufsmount.h>
        !            53: +#undef        _KERNEL
        !            54: +# endif       /* defined(HASI_FFS1) */
        !            55: +
        !            56:  #include <ufs/ufs/inode.h>
        !            57:  
        !            58:  # if  defined(DIRENT_BLKSIZ)
        !            59: @@ -223,9 +245,10 @@ struct sockproto {
        !            60:  
        !            61:  # if  defined(HASNULLFS)
        !            62:  #define       _KERNEL
        !            63: -#  if defined(NETBSDV) && NETBSDV>=1050
        !            64: +#  if defined(NETBSDV) && NETBSDV>=1050 && __NetBSD_Version__<106060000
        !            65:  #include "netexport.h"
        !            66: -#  endif      /* defined(NETBSDV) && NETBSDV>=1050 */
        !            67: +#  endif      /* defined(NETBSDV) && NETBSDV>=1050
        !            68: +                 && __NetBSD_Version__<106060000 */
        !            69:  #include <miscfs/nullfs/null.h>
        !            70:  #undef        _KERNEL
        !            71:  # endif       /* defined(HASNULLFS) */

CVSweb <webmaster@jp.NetBSD.org>