Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e98d530 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

Synchronize fuse header with one used in library 



The library one has provisions for use in *BSD, add them to the kernel one too.
They don't hurt and ease maintenance.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
parent 0415d291

include/uapi/linux/fuse.h

+36 −1
Original line number Diff line number Diff line 
/*

    FUSE: Filesystem in Userspace

    This file defines the kernel interface of FUSE

    Copyright (C) 2001-2008  Miklos Szeredi <miklos@szeredi.hu>



    This program can be distributed under the terms of the GNU GPL.

    See the file COPYING.



    This -- and only this -- header file may also be distributed under

    the terms of the BSD Licence as follows:



    Copyright (C) 2001-2007 Miklos Szeredi. All rights reserved.



    Redistribution and use in source and binary forms, with or without

    modification, are permitted provided that the following conditions

    are met:

    1. Redistributions of source code must retain the above copyright

       notice, this list of conditions and the following disclaimer.

    2. Redistributions in binary form must reproduce the above copyright

       notice, this list of conditions and the following disclaimer in the

       documentation and/or other materials provided with the distribution.



    THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND

    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

    ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE

    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

    SUCH DAMAGE.

*/



/*
@@ -69,7 +95,16 @@ 
#ifndef _LINUX_FUSE_H

#define _LINUX_FUSE_H



#ifdef __linux__

#include <linux/types.h>

#else

#include <stdint.h>

#define __u64 uint64_t

#define __s64 int64_t

#define __u32 uint32_t

#define __s32 int32_t

#define __u16 uint16_t

#endif



/*

 * Version negotiation: