diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-09-21 19:38:09 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-09-21 19:38:09 +0000 |
commit | 17c269611149a11c438bf48a25568042ff3c23d6 (patch) | |
tree | 2a37315c0fdbc765c6bc05c36ffc096fff75b3a3 /klaptopdaemon/linux/cs_types.h | |
parent | 0a9b7cf52a2f5551c53fc13efae0f8525ff239ab (diff) | |
download | tdeutils-17c269611149a11c438bf48a25568042ff3c23d6.tar.gz tdeutils-17c269611149a11c438bf48a25568042ff3c23d6.zip |
Fix GPL/MPL license incompatibility in klaptopdaemon by replacing all MPL licensed files in kdeutils/klaptopdaemon with GPL or dual licensed copies from the Internet
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1254856 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'klaptopdaemon/linux/cs_types.h')
-rw-r--r-- | klaptopdaemon/linux/cs_types.h | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/klaptopdaemon/linux/cs_types.h b/klaptopdaemon/linux/cs_types.h index 8f9df45..b18f7f8 100644 --- a/klaptopdaemon/linux/cs_types.h +++ b/klaptopdaemon/linux/cs_types.h @@ -1,8 +1,8 @@ /* - * cs_types.h 1.13 1998/07/14 00:52:20 + * cs_types.h 1.18 2000/06/12 21:55:40 * * The contents of this file are subject to the Mozilla Public License - * Version 1.0 (the "License"); you may not use this file except in + * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License * at http://www.mozilla.org/MPL/ * @@ -12,20 +12,42 @@ * limitations under the License. * * The initial developer of the original code is David A. Hinds - * <dhinds@hyper.stanford.edu>. Portions created by David A. Hinds - * are Copyright (C) 1998 David A. Hinds. All Rights Reserved. + * <dahinds@users.sourceforge.net>. Portions created by David A. Hinds + * are Copyright (C) 1999 David A. Hinds. All Rights Reserved. + * + * Contributor: Apple Computer, Inc. Portions � 2000 Apple Computer, + * Inc. All rights reserved. + * + * Alternatively, the contents of this file may be used under the + * terms of the GNU Public License version 2 (the "GPL"), in which + * case the provisions of the GPL are applicable instead of the + * above. If you wish to allow the use of your version of this file + * only under the terms of the GPL and not to allow others to use + * your version of this file under the MPL, indicate your decision by + * deleting the provisions above and replace them with the notice and + * other provisions required by the GPL. If you do not delete the + * provisions above, a recipient may use your version of this file + * under either the MPL or the GPL. */ #ifndef _LINUX_CS_TYPES_H #define _LINUX_CS_TYPES_H #ifdef __linux__ +#ifdef __KERNEL__ #include <linux/types.h> +#else +#include <sys/types.h> +#endif #endif typedef u_short socket_t; typedef u_short ioaddr_t; +#ifdef __MACOSX__ +typedef u_int cs_event_t; +#else typedef u_int event_t; +#endif typedef u_char cisdata_t; typedef u_short page_t; |