fix license headers, and prevent multiple includes of comedilib_scxi.h

diff --git a/include/comedi.h b/include/comedi.h
index a22c2b203cef1156f6e383aac2673e5d7a47887b..c851da7e12bf12fa080183d052fc3018bcf5756d 100644 (file)
--- a/include/comedi.h
+++ b/include/comedi.h
@@ -6,7 +6,7 @@
     Copyright (C) 1998-2001 David A. Schleef <ds@schleef.org>
 
     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 81ef65e399bc7effcbc478004b3205d13a464cc4..f5ab0ae3fd6ca0f4b938dace8444a4400602b95f 100644 (file)
--- a/include/comedilib.h
+++ b/include/comedilib.h
@@ -6,7 +6,7 @@
     Copyright (C) 1998-2002 David A. Schleef <ds@schleef.org>
 
     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 c9fd2d17bf499dc3241614e8b50278ce2ccfebab..dad24d7d015821f27c0388beff76e5596e161e92 100644 (file)
--- 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 <ds@schleef.org>
+
+    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 <comedilib.h>
 
 #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