aboutsummaryrefslogtreecommitdiffstats
path: root/include/sys/timer.h
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2010-05-17 15:18:00 -0700
committerBrian Behlendorf <[email protected]>2010-05-17 15:18:00 -0700
commit716154c5926eb391eb8178203496430ffa7ebed8 (patch)
tree2ee1527e5c1d4db913e2c684cdf9fcf630795b27 /include/sys/timer.h
parent8e2140b770152df7aa91e495f11a73308bfc6c13 (diff)
Public Release Prep
Updated AUTHORS, COPYING, DISCLAIMER, and INSTALL files. Added standardized headers to all source file to clearly indicate the copyright, license, and to give credit where credit is due.
Diffstat (limited to 'include/sys/timer.h')
-rw-r--r--include/sys/timer.h40
1 files changed, 15 insertions, 25 deletions
diff --git a/include/sys/timer.h b/include/sys/timer.h
index b7aff1184..3af57d8f5 100644
--- a/include/sys/timer.h
+++ b/include/sys/timer.h
@@ -1,36 +1,30 @@
-/*
- * This file is part of the SPL: Solaris Porting Layer.
- *
- * Copyright (c) 2008 Lawrence Livermore National Security, LLC.
- * Produced at Lawrence Livermore National Laboratory
- * Written by:
- * Brian Behlendorf <[email protected]>,
- * Herb Wartens <[email protected]>,
- * Jim Garlick <[email protected]>
+/*****************************************************************************\
+ * Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC.
+ * Copyright (C) 2007 The Regents of the University of California.
+ * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+ * Written by Brian Behlendorf <[email protected]>.
* UCRL-CODE-235197
*
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This file is part of the SPL, Solaris Porting Layer.
+ * For details, see <http://github.com/behlendorf/spl/>.
+ *
+ * The SPL is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
*
- * This is distributed in the hope that it will be useful, but WITHOUT
+ * The SPL 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
* for more details.
*
* You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+ * with the SPL. If not, see <http://www.gnu.org/licenses/>.
+\*****************************************************************************/
#ifndef _SPL_TIMER_H
#define _SPL_TIMER_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/timer.h>
@@ -40,9 +34,5 @@ extern "C" {
#define delay(ticks) schedule_timeout((long)(ticks))
-#ifdef __cplusplus
-}
-#endif
-
#endif /* _SPL_TIMER_H */