From: Miklos Szeredi <miklos@szeredi.hu>
Date: Tue, 18 Sep 2007 11:27:56 +0000 (+0000)
Subject: move BSD license out from ifdefed region
X-Git-Tag: fuse_2_7_1~9
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=13e348fe050d18b18db26612ed46598e40d8a62d;p=qemu-gpiodev%2Flibfuse.git

move BSD license out from ifdefed region
---

diff --git a/kernel/fuse_kernel.h b/kernel/fuse_kernel.h
index 7ebff8b..be124ee 100644
--- a/kernel/fuse_kernel.h
+++ b/kernel/fuse_kernel.h
@@ -1,19 +1,14 @@
 /*
-    FUSE: Filesystem in Userspace
+    This file defines the kernel interface of FUSE
     Copyright (C) 2001-2007  Miklos Szeredi <miklos@szeredi.hu>
 
     This program can be distributed under the terms of the GNU GPL.
     See the file COPYING.
-*/
-
-/* This file defines the kernel interface of FUSE */
 
-#ifdef __FreeBSD__
-/*
     This -- and only this -- header file may also be distributed under
     the terms of the BSD Licence as follows:
 
-    Copyright (C) 2001-2006 Miklos Szeredi. All rights reserved.
+    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
@@ -37,6 +32,7 @@
     SUCH DAMAGE.
 */
 
+#ifndef linux
 #include <sys/types.h>
 #define __u64 uint64_t
 #define __u32 uint32_t