[Firebird-checkins] CVS: firebird2/src/include fb_types.h,1.46,1.47 firebird.h,1.29,1.30

[Claudio V. C. <ro...@us...>]

Build Version :  T2.0.0.9842 Firebird 2.0 UNSTABLE

(writeBuildNum.sh,v 1.9846 2004/12/10 20:51:03 robocop Exp  )

Update of /cvsroot/firebird/firebird2/src/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5797/src/include

Modified Files:
	fb_types.h firebird.h 
Log Message:
Changing the license with permission from Mark, Mike and John.

Index: fb_types.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/include/fb_types.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -b -U3 -r1.46 -r1.47
--- fb_types.h	20 May 2004 21:58:04 -0000	1.46
+++ fb_types.h	10 Dec 2004 20:50:53 -0000	1.47
@@ -1,33 +1,29 @@
 /*
+ *	PROGRAM:		Firebird RDBMS definitions
+ *	MODULE:			fb_types.h
+ *	DESCRIPTION:	Firebird's platform independent data types header
+ *
+ *  The contents of this file are subject to the Initial
+ *  Developer's Public License Version 1.0 (the "License");
+ *  you may not use this file except in compliance with the
+ *  License. You may obtain a copy of the License at
+ *  http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
+ *
+ *  Software distributed under the License is distributed AS IS,
+ *  WITHOUT WARRANTY OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing rights
+ *  and limitations under the License.
  *
- *  The contents of this file are subject to the Mozilla Public
- *  License Version 1.1 (the "License"); you may not use this file
- *  except in compliance with the License. You may obtain a copy of
- *  the License at http://www.mozilla.org/MPL/
- *  Alternatively, the contents of this file may be used under the
- *  terms of the GNU General Public License Version 2 or later (the
- *  "GPL"), in which case the provisions of the GPL are applicable
- *  instead of those above. You may obtain a copy of the Licence at
- *  http://www.gnu.org/copyleft/gpl.html
- *
- *  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
- *    Relevant for more details.
- *
- *    This file was created by members of the firebird development team.
- *    All individual contributions remain the Copyright (C) of those
- *    individuals.  Contributors to this file are either listed here or
- *    can be obtained from a CVS history command.
+ *  The Original Code was created by Mike Nordell and Mark O'Donohue
+ *  for the Firebird Open Source RDBMS project.
  *
- *   All rights reserved.
- *
- *   Contributor(s):
+ *  Copyright (c) 2001
  *       Mike Nordel <ta...@al...>
  *       Mark O'Donohue <mar...@lu...>
+ *  and all contributors signed below.
  *
- *
- *  $Id$
+ *  All Rights Reserved.
+ *  Contributor(s): ______________________________________.
  *
  * 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "OS/2" port
  *

Index: firebird.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/include/firebird.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -b -U3 -r1.29 -r1.30
--- firebird.h	16 Aug 2004 12:28:43 -0000	1.29
+++ firebird.h	10 Dec 2004 20:50:53 -0000	1.30
@@ -1,39 +1,35 @@
-#ifndef INCLUDE_Firebird_H
-#define INCLUDE_Firebird_H
-
 /*
- *  The contents of this file are subject to the Mozilla Public
- *  License Version 1.1 (the "License"); you may not use this file
- *  except in compliance with the License. You may obtain a copy of
- *  the License at http://www.mozilla.org/MPL/
- *  Alternatively, the contents of this file may be used under the
- *  terms of the GNU General Public License Version 2 or later (the
- *  "GPL"), in which case the provisions of the GPL are applicable
- *  instead of those above. You may obtain a copy of the Licence at
- *  http://www.gnu.org/copyleft/gpl.html
- *
- *  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
- *  Relevant for more details.
- *
- *  This file was created by members of the firebird development team.
- *  All individual contributions remain the Copyright (C) of those
- *  individuals.  Contributors to this file are either listed here or
- *  can be obtained from a CVS history command.
+ *	PROGRAM:		Firebird RDBMS definitions
+ *	MODULE:			firebird.h
+ *	DESCRIPTION:	Main Firebird header.
+ *
+ *  The contents of this file are subject to the Initial
+ *  Developer's Public License Version 1.0 (the "License");
+ *  you may not use this file except in compliance with the
+ *  License. You may obtain a copy of the License at
+ *  http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
+ *
+ *  Software distributed under the License is distributed AS IS,
+ *  WITHOUT WARRANTY OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing rights
+ *  and limitations under the License.
  *
- *  All rights reserved.
+ *  The Original Code was created by Mark O'Donohue, Mike Nordell and John Bellardo
+ *  for the Firebird Open Source RDBMS project.
  *
- *  Contributor(s):
+ *  Copyright (c) 2001
  *       Mark O'Donohue <mar...@lu...>
  *       Mike Nordell   <ta...@al...>
  *       John Bellardo  <bel...@cs...>
+  *  and all contributors signed below.
  *
- *
- *  $Id$
+ *  All Rights Reserved.
+ *  Contributor(s): ______________________________________.
  *
  */
 
+#ifndef INCLUDE_Firebird_H
+#define INCLUDE_Firebird_H
 
 #include "gen/autoconfig.h"