* dejagnu.h: Update copyright notice. Use C-style /* .. */

	comments for portability with ISO C compilers.
	* testsuite/libdejagnu/unit.cc: Likewise, update copyright notice.

3 files changed, 35 insertions, 29 deletions

diff --git a/ChangeLog b/ChangeLog
index 6433abc..385c04e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-01-01  Ben Elliston  <bje@gnu.org>
 
+	* dejagnu.h: Update copyright notice.  Use C-style /* .. */
+	comments for portability with ISO C compilers.
+	* testsuite/libdejagnu/unit.cc: Likewise, update copyright notice.
+
+2006-01-01  Ben Elliston  <bje@gnu.org>
+
 	* runtest.exp: Update copyright notice.
 	* example/calc/testsuite/calc.test/calc.exp: Likewise.
 	* example/calc/testsuite/config/unix.exp: Likewise.
diff --git a/dejagnu.h b/dejagnu.h
index cc2be37..4240197 100644
--- a/dejagnu.h
+++ b/dejagnu.h
@@ -1,20 +1,21 @@
-/*
- * Copyright (C) 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
- *
- * 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
- * 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 DejaGnu; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
- */
+/* Dejagnu unit testing header.
+   Copyright (C) 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
+
+This file is part of DejaGnu.
+
+DejaGnu 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.
+
+DejaGnu 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 DejaGnu; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef __DEJAGNU_H__
 #define __DEJAGNU_H__
@@ -260,5 +261,5 @@ class TestState {
     std::string GetMsg (void) { return lastmsg; }
 };
 
-#endif // __cplusplus
-#endif // _DEJAGNU_H_
+#endif /* __cplusplus */
+#endif /* _DEJAGNU_H_ */
diff --git a/testsuite/libdejagnu/unit.cc b/testsuite/libdejagnu/unit.cc
index e010cf2..d6e08a9 100644
--- a/testsuite/libdejagnu/unit.cc
+++ b/testsuite/libdejagnu/unit.cc
@@ -1,23 +1,22 @@
-// unit.cc -- This is a test case for the Dejagnu.h classes.
+// unit.cc -- This is a test case for the dejagnu.h classes.
 // Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-// 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
+// This file is part of DejaGnu.
+
+// DejaGnu 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 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.
+// DejaGnu 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 DejaGnu; if not, write to the Free Software Foundation,
 // Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
-// Please email any bugs, comments, and/or additions to this file to:
-// bug-dejagnu@gnu.org
-
 #include <sys/types.h>
 #include <iostream>
 #include <regex.h>