From cd07b7217bf438e4755387f9803a456fd48f32e8 Mon Sep 17 00:00:00 2001 From: Frank Mori Hess Date: Sun, 6 Feb 2005 16:22:41 +0000 Subject: [PATCH] fix license headers, and prevent multiple includes of comedilib_scxi.h --- include/comedi.h | 2 +- include/comedilib.h | 2 +- include/comedilib_scxi.h | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/include/comedi.h b/include/comedi.h index a22c2b2..c851da7 100644 --- a/include/comedi.h +++ b/include/comedi.h @@ -6,7 +6,7 @@ Copyright (C) 1998-2001 David A. Schleef This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by + it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. diff --git a/include/comedilib.h b/include/comedilib.h index 81ef65e..f5ab0ae 100644 --- a/include/comedilib.h +++ b/include/comedilib.h @@ -6,7 +6,7 @@ Copyright (C) 1998-2002 David A. Schleef This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by + it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. diff --git a/include/comedilib_scxi.h b/include/comedilib_scxi.h index c9fd2d1..dad24d7 100644 --- a/include/comedilib_scxi.h +++ b/include/comedilib_scxi.h @@ -1,3 +1,29 @@ +/* + include/comedilib_scxi.h + header file for the comedi library routines + + COMEDI - Linux Control and Measurement Device Interface + Copyright (C) 1998-2002 David A. Schleef + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + 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 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., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#ifndef _COMEDILIB_SCXI_H +#define _COMEDILIB_SCXI_H + #include #define SLOT0_INTERVAL 1200 @@ -54,3 +80,5 @@ int comedi_scxi_register_readwrite(scxi_mod_t *mod, unsigned short reg_address, #ifdef __cplusplus } #endif + +#endif // _COMEDILIB_SCXI_H -- 2.26.2