diff --git a/libcfs/include/libcfs/darwin/portals_utils.h b/libcfs/include/libcfs/darwin/portals_utils.h deleted file mode 100644 index 4dcb6b7787ee9c445f7aaa19bdf32e53be86d2fa..0000000000000000000000000000000000000000 --- a/libcfs/include/libcfs/darwin/portals_utils.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * - * GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * GPL HEADER END - */ -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved - * Use is subject to license terms. - */ -/* - * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. - */ - -#ifndef __LIBCFS_DARWIN_PORTALS_UTILS_H__ -#define __LIBCFS_DARWIN_PORTALS_UTILS_H__ - -#ifndef __LIBCFS_PORTALS_UTILS_H__ -#error Do not #include this file directly. #include <libcfs/portals_utils.h> instead -#endif - -#include <libcfs/list.h> -#ifdef __KERNEL__ -#include <mach/mach_types.h> -#include <libcfs/libcfs.h> -#else /* !__KERNEL__ */ -#include <machine/endian.h> -#include <netinet/in.h> -#include <sys/syscall.h> -#endif /* !__KERNEL__ */ - -#endif diff --git a/libcfs/include/libcfs/linux/portals_utils.h b/libcfs/include/libcfs/linux/portals_utils.h deleted file mode 100644 index 7d5788bae99a3ffc199337bc01227e18d91f6a4b..0000000000000000000000000000000000000000 --- a/libcfs/include/libcfs/linux/portals_utils.h +++ /dev/null @@ -1,87 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * - * GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * GPL HEADER END - */ -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved - * Use is subject to license terms. - */ -/* - * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. - */ - -#ifndef __LIBCFS_LINUX_PORTALS_UTILS_H__ -#define __LIBCFS_LINUX_PORTALS_UTILS_H__ - -#ifndef __LIBCFS_PORTALS_UTILS_H__ -#error Do not #include this file directly. #include <libcfs/portals_utils.h> instead -#endif - -#ifdef __KERNEL__ -#include <linux/proc_fs.h> -#include <linux/init.h> -#include <linux/kernel.h> -#include <linux/sched.h> -#include <linux/wait.h> -#include <linux/smp_lock.h> -#include <linux/poll.h> -#include <linux/random.h> - -#include <asm/unistd.h> -#include <asm/semaphore.h> - -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) -# include <linux/tqueue.h> -#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) */ -# include <linux/workqueue.h> -#endif -#include <libcfs/linux/linux-mem.h> -#include <libcfs/linux/linux-prim.h> -#else /* !__KERNEL__ */ - -#include <endian.h> -#include <libcfs/list.h> - -#ifdef HAVE_LINUX_VERSION_H -# include <linux/version.h> - -# if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) -# define BUG() /* workaround for module.h includes */ -# include <linux/module.h> -# endif -#endif /* !HAVE_LINUX_VERSION_H */ - -#ifndef __CYGWIN__ -# include <sys/syscall.h> -#else /* __CYGWIN__ */ -# include <windows.h> -# include <windef.h> -# include <netinet/in.h> -#endif /* __CYGWIN__ */ - -#endif /* !__KERNEL__ */ -#endif diff --git a/libcfs/include/libcfs/portals_utils.h b/libcfs/include/libcfs/portals_utils.h deleted file mode 100644 index 7d36ec6432af1d758891a7d86470bdd5b32555e3..0000000000000000000000000000000000000000 --- a/libcfs/include/libcfs/portals_utils.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * - * GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * GPL HEADER END - */ -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved - * Use is subject to license terms. - */ -/* - * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. - */ - -#ifndef __LIBCFS_PORTALS_UTILS_H__ -#define __LIBCFS_PORTALS_UTILS_H__ - -/* - * portals_utils.h - * - */ -#if defined(__linux__) -#include <libcfs/linux/portals_utils.h> -#elif defined(__APPLE__) -#include <libcfs/darwin/portals_utils.h> -#elif defined(__WINNT__) -#include <libcfs/winnt/portals_utils.h> -#else -#error Unsupported Operating System -#endif - -#endif