From 598977fa886cc20b1195dc36d1f22130e5f659fa Mon Sep 17 00:00:00 2001 From: Gregory Burd Date: Sun, 21 Oct 2007 02:57:28 +0100 Subject: [PATCH] Update license to GPL version 3. --- LICENSE_EXCEPTIONS | 29 ++- dist/Makefile.in | 10 +- dist/RELEASE | 12 +- dist/buildrel | 13 +- dist/configure.ac | 10 +- dist/dbsql.pc.in | 10 +- dist/dbsql.spec.in | 10 +- dist/gen_inc.awk | 10 +- dist/s_all | 10 +- dist/s_config | 10 +- dist/s_include | 10 +- dist/s_perm | 10 +- dist/s_readme | 10 +- dist/s_symlink | 10 +- dist/s_tags | 10 +- dist/s_test | 14 +- dist/srcfiles.in | 10 +- dist/win_config.in | 418 --------------------------------------- dist/win_dbsql.in | 60 ------ dist/win_exports.in | 136 ------------- src/api.c | 10 +- src/api_table.c | 10 +- src/cg_attach.c | 10 +- src/cg_auth.c | 10 +- src/cg_build.c | 10 +- src/cg_copy.c | 10 +- src/cg_date.c | 10 +- src/cg_delete.c | 10 +- src/cg_expr.c | 10 +- src/cg_insert.c | 10 +- src/cg_pragma.c | 10 +- src/cg_select.c | 10 +- src/cg_trigger.c | 12 +- src/cg_update.c | 10 +- src/cg_vacuum.c | 10 +- src/cg_where.c | 10 +- src/clib/getopt.c | 10 +- src/clib/memcmp.c | 10 +- src/clib/random.c | 10 +- src/clib/snprintf.c | 10 +- src/clib/strcasecmp.c | 10 +- src/clib/strdup.c | 10 +- src/clib/xvprintf.c | 10 +- src/common/dbsql_alloc.c | 10 +- src/common/dbsql_atof.c | 10 +- src/common/dbsql_atoi.c | 14 +- src/common/dbsql_err.c | 10 +- src/common/hash.c | 10 +- src/common/str.c | 10 +- src/dbsql.in | 10 +- src/dbsql/dbsql.c | 11 +- src/dbsql_tclsh.c | 10 +- src/inc/db_int.h | 14 +- src/inc/dbsql_int.in | 14 +- src/inc/hash.h | 14 +- src/inc/random.h | 19 +- src/inc/str.h | 14 +- src/inc/vdbe.h | 14 +- src/inc/vdbe_int.h | 14 +- src/inc/xvprintf.h | 14 +- src/lemon/lemon.c | 35 +++- src/lemon/lempar.c | 27 ++- src/os/os_jtime.c | 10 +- src/py/extended_setup.py | 11 +- src/py/setup.py.in | 11 +- src/safety.c | 12 +- src/sm.c | 12 +- src/sql_fns.c | 12 +- src/sql_parser.y | 12 +- src/sql_tokenize.c | 12 +- src/vdbe.c | 12 +- src/vdbe_method.c | 12 +- 72 files changed, 415 insertions(+), 1019 deletions(-) delete mode 100644 dist/win_config.in delete mode 100644 dist/win_dbsql.in delete mode 100644 dist/win_exports.in diff --git a/LICENSE_EXCEPTIONS b/LICENSE_EXCEPTIONS index 4a0becf..86b398c 100644 --- a/LICENSE_EXCEPTIONS +++ b/LICENSE_EXCEPTIONS @@ -1,31 +1,28 @@ -FLOSS License Exception v1.0 +FLOSS License Exception v2.0 +20 October 2007 The DBSQL Exception for Free/Libre and Open Source Software-only Applications -Using DBSQL Libraries (the "FLOSS Exception"). - -Version 1.0, 4 February 2007 +using DBSQL libraries and related resources (the "FLOSS Exception"). Exception Intent We want specified Free/Libre and Open Source Software ("FLOSS") applications to be able to use specified GPL-licensed DBSQL client libraries (the "Program") -despite the fact that not all FLOSS licenses are compatible with version 2 of +despite the fact that not all FLOSS licenses are compatible with version 3 of the GNU General Public License (the "GPL"). Legal Terms and Conditions -As a special exception to the terms and conditions of version 2.0 or later of -the GPL: - -You are free to distribute a Derivative Work that is formed entirely from the -Program and one or more works (each, a "FLOSS Work") licensed under one or -more of the licenses listed below in section 1, as long as: +As a special exception to the terms and conditions of version 3 or later of +the GPL you are free to distribute a Derivative Work that is formed entirely +from the Program and one or more works (each, a "FLOSS Work") licensed under +one or more of the licenses listed below in section 1, as long as: 1. You obey the GPL in all respects for the Program and the Derivative Work, except for identifiable sections of the Derivative Work which are not derived from the Program, and which can reasonably be considered independent and separate works in themselves, - 2. all identifiable sections of the Derivative Work which are not derived + 2. All identifiable sections of the Derivative Work which are not derived from the Program, and which can reasonably be considered independent and separate works in themselves, 1. are distributed subject to one of the FLOSS licenses listed below, @@ -50,15 +47,17 @@ another valid licensing option from The DBSQL Group, Inc. License name Version(s)/Copyright Date -----------------------------------------------------|------------------------- Academic Free License | 2.0 -Apache Software License | 1.0/1.1/2.0 +Apache Software License | 1.0/1.1/2.0 or later Apple Public Source License | 2.0 Artistic license | From Perl 5.8.0 BSD license | "July 22 1999" Common Development and Distribution License (CDDL) | 1.0 Common Public License | 1.0 -GNU Library or "Lesser" General Public License (LGPL)| 2.0/2.1 +GNU Library or "Lesser" General Public License (LGPL)| 2.0/2.1/3.0 Jabber Open Source License | 1.0 MIT License (As listed in file MIT-License.txt) | - +Microsoft Public License (Ms-PL) | 2007 +Microsoft Reciprocal License (Ms-RL) | 2007 Mozilla Public License (MPL) | 1.0/1.1 Open Software License | 2.0 OpenSSL license (with original SSLeay license) | "2003" ("1998") @@ -106,4 +105,4 @@ licenses noted under the "FLOSS license list" section remains a prerequisite. Package name | Qualifying License | Version ------------------------------|--------------------------|--------------------- -Apache Portable Runtime (APR) | Apache Software License | 2.0 +Apache Portable Runtime (APR) | Apache Software License | 2.0 or later diff --git a/dist/Makefile.in b/dist/Makefile.in index fc82e44..1e7e020 100644 --- a/dist/Makefile.in +++ b/dist/Makefile.in @@ -2,10 +2,10 @@ # # Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. # -# This library 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.1 of the License, or (at your option) any later version. +# This library 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 3 of the License, or +# (at your option) any later version. # # There are special exceptions to the terms and conditions of the GPL as it # is applied to this software. View the full text of the exception in file @@ -16,8 +16,6 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # -# http://creativecommons.org/licenses/GPL/2.0/ -# # $Id: Makefile.in 7 2007-02-03 13:34:17Z gburd $ srcdir= @srcdir@/../src diff --git a/dist/RELEASE b/dist/RELEASE index 5a74adf..ebb0c4d 100644 --- a/dist/RELEASE +++ b/dist/RELEASE @@ -2,10 +2,10 @@ # # Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. # -# This library 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.1 of the License, or (at your option) any later version. +# This library 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 3 of the License, or +# (at your option) any later version. # # There are special exceptions to the terms and conditions of the GPL as it # is applied to this software. View the full text of the exception in file @@ -16,13 +16,11 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # -# http://creativecommons.org/licenses/GPL/2.0/ -# # $Id: RELEASE 7 2007-02-03 13:34:17Z gburd $ DBSQL_VERSION_MAJOR=0 DBSQL_VERSION_MINOR=2 -DBSQL_VERSION_PATCH=2 +DBSQL_VERSION_PATCH=3 DBSQL_VERSION="$DBSQL_VERSION_MAJOR.$DBSQL_VERSION_MINOR.$DBSQL_VERSION_PATCH" DBSQL_VERSION_UNIQUE_NAME=`printf "_%d%03d" $DBSQL_VERSION_MAJOR $DBSQL_VERSION_MINOR` diff --git a/dist/buildrel b/dist/buildrel index d5a1a78..ca5d1a7 100644 --- a/dist/buildrel +++ b/dist/buildrel @@ -2,10 +2,10 @@ # # Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. # -# This library 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.1 of the License, or (at your option) any later version. +# This library 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 3 of the License, or +# (at your option) any later version. # # There are special exceptions to the terms and conditions of the GPL as it # is applied to this software. View the full text of the exception in file @@ -16,13 +16,12 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # -# http://creativecommons.org/licenses/GPL/2.0/ -# # $Id: buildrel 7 2007-02-03 13:34:17Z gburd $ + # # Build the distribution package. -# # A set of commands intended to be cut and pasted into a csh window. +# # Development tree, release home. setenv D `pwd` diff --git a/dist/configure.ac b/dist/configure.ac index eb01c16..a6aa181 100644 --- a/dist/configure.ac +++ b/dist/configure.ac @@ -2,10 +2,10 @@ # # Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. # -# This library 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.1 of the License, or (at your option) any later version. +# This library 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 3 of the License, or +# (at your option) any later version. # # There are special exceptions to the terms and conditions of the GPL as it # is applied to this software. View the full text of the exception in file @@ -16,8 +16,6 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # -# http://creativecommons.org/licenses/GPL/2.0/ -# # $Id: configure.ac 7 2007-02-03 13:34:17Z gburd $ # Process this file with autoconf to produce a configure script. diff --git a/dist/dbsql.pc.in b/dist/dbsql.pc.in index fde00eb..5c3daee 100644 --- a/dist/dbsql.pc.in +++ b/dist/dbsql.pc.in @@ -2,10 +2,10 @@ # # Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. # -# This library 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.1 of the License, or (at your option) any later version. +# This library 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 3 of the License, or +# (at your option) any later version. # # There are special exceptions to the terms and conditions of the GPL as it # is applied to this software. View the full text of the exception in file @@ -16,8 +16,6 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # -# http://creativecommons.org/licenses/GPL/2.0/ -# # Package Information for pkg-config diff --git a/dist/dbsql.spec.in b/dist/dbsql.spec.in index 69c6478..b2940cf 100644 --- a/dist/dbsql.spec.in +++ b/dist/dbsql.spec.in @@ -2,10 +2,10 @@ # # Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. # -# This library 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.1 of the License, or (at your option) any later version. +# This library 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 3 of the License, or +# (at your option) any later version. # # There are special exceptions to the terms and conditions of the GPL as it # is applied to this software. View the full text of the exception in file @@ -16,8 +16,6 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # -# http://creativecommons.org/licenses/GPL/2.0/ -# # DBSQL @DBSQL_VERSION_MAJOR@.@DBSQL_VERSION_MINOR@.@DBSQL_VERSION_PATCH@ Summary: DBSQL - A SQL database library. diff --git a/dist/gen_inc.awk b/dist/gen_inc.awk index b563f54..f87cafd 100644 --- a/dist/gen_inc.awk +++ b/dist/gen_inc.awk @@ -2,10 +2,10 @@ # # Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. # -# This library 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.1 of the License, or (at your option) any later version. +# This library 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 3 of the License, or +# (at your option) any later version. # # There are special exceptions to the terms and conditions of the GPL as it # is applied to this software. View the full text of the exception in file @@ -15,8 +15,6 @@ # 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. -# -# http://creativecommons.org/licenses/GPL/2.0/ # This awk script parses C input files looking for lines marked "PUBLIC:" # and "EXTERN:". (PUBLIC lines are DB internal function prototypes and diff --git a/dist/s_all b/dist/s_all index cc9f245..b2948a6 100644 --- a/dist/s_all +++ b/dist/s_all @@ -3,10 +3,10 @@ # # Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. # -# This library 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.1 of the License, or (at your option) any later version. +# This library 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 3 of the License, or +# (at your option) any later version. # # There are special exceptions to the terms and conditions of the GPL as it # is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # -# http://creativecommons.org/licenses/GPL/2.0/ -# # $Id: s_all 7 2007-02-03 13:34:17Z gburd $ sh s_perm # permissions. diff --git a/dist/s_config b/dist/s_config index 7db3c2f..a96b00f 100644 --- a/dist/s_config +++ b/dist/s_config @@ -3,10 +3,10 @@ # # Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. # -# This library 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.1 of the License, or (at your option) any later version. +# This library 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 3 of the License, or +# (at your option) any later version. # # There are special exceptions to the terms and conditions of the GPL as it # is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # -# http://creativecommons.org/licenses/GPL/2.0/ -# # $Id: s_config 7 2007-02-03 13:34:17Z gburd $ # # Build the autoconfiguration files. diff --git a/dist/s_include b/dist/s_include index 253f4df..c9640d1 100644 --- a/dist/s_include +++ b/dist/s_include @@ -3,10 +3,10 @@ # # Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. # -# This library 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.1 of the License, or (at your option) any later version. +# This library 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 3 of the License, or +# (at your option) any later version. # # There are special exceptions to the terms and conditions of the GPL as it # is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # -# http://creativecommons.org/licenses/GPL/2.0/ -# # $Id: s_include 7 2007-02-03 13:34:17Z gburd $ # # Build the automatically generated function prototype files. diff --git a/dist/s_perm b/dist/s_perm index f91da6f..e206bba 100644 --- a/dist/s_perm +++ b/dist/s_perm @@ -3,10 +3,10 @@ # # Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. # -# This library 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.1 of the License, or (at your option) any later version. +# This library 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 3 of the License, or +# (at your option) any later version. # # There are special exceptions to the terms and conditions of the GPL as it # is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # -# http://creativecommons.org/licenses/GPL/2.0/ -# # $Id: s_perm 7 2007-02-03 13:34:17Z gburd $ d=.. diff --git a/dist/s_readme b/dist/s_readme index dce35ae..837c0ec 100644 --- a/dist/s_readme +++ b/dist/s_readme @@ -3,10 +3,10 @@ # # Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. # -# This library 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.1 of the License, or (at your option) any later version. +# This library 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 3 of the License, or +# (at your option) any later version. # # There are special exceptions to the terms and conditions of the GPL as it # is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # -# http://creativecommons.org/licenses/GPL/2.0/ -# # $Id: s_readme 7 2007-02-03 13:34:17Z gburd $ # # Build the README. diff --git a/dist/s_symlink b/dist/s_symlink index c0bc00e..461d2ef 100644 --- a/dist/s_symlink +++ b/dist/s_symlink @@ -3,10 +3,10 @@ # # Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. # -# This library 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.1 of the License, or (at your option) any later version. +# This library 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 3 of the License, or +# (at your option) any later version. # # There are special exceptions to the terms and conditions of the GPL as it # is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # -# http://creativecommons.org/licenses/GPL/2.0/ -# # $Id: s_symlink 7 2007-02-03 13:34:17Z gburd $ echo 'Creating DBSQL source tree symbolic links...' diff --git a/dist/s_tags b/dist/s_tags index 9edaf5b..ad84425 100644 --- a/dist/s_tags +++ b/dist/s_tags @@ -3,10 +3,10 @@ # # Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. # -# This library 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.1 of the License, or (at your option) any later version. +# This library 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 3 of the License, or +# (at your option) any later version. # # There are special exceptions to the terms and conditions of the GPL as it # is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # -# http://creativecommons.org/licenses/GPL/2.0/ -# # $Id: s_tags 7 2007-02-03 13:34:17Z gburd $ # # Build tags files. diff --git a/dist/s_test b/dist/s_test index 8db3983..d050a08 100644 --- a/dist/s_test +++ b/dist/s_test @@ -3,18 +3,20 @@ # # Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. # -# This library 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.1 of the License, or (at your option) any later version. +# This library 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 3 of the License, or +# (at your option) any later version. +# +# There are special exceptions to the terms and conditions of the GPL as it +# is applied to this software. View the full text of the exception in file +# LICENSE_EXCEPTIONS in the directory of this software distribution. # # This library 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. # -# http://creativecommons.org/licenses/GPL/2.0/ -# # $Id: s_test 7 2007-02-03 13:34:17Z gburd $ # # Build the Tcl test files. diff --git a/dist/srcfiles.in b/dist/srcfiles.in index 5781dad..8155c31 100644 --- a/dist/srcfiles.in +++ b/dist/srcfiles.in @@ -2,10 +2,10 @@ # # Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. # -# This library 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.1 of the License, or (at your option) any later version. +# This library 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 3 of the License, or +# (at your option) any later version. # # There are special exceptions to the terms and conditions of the GPL as it # is applied to this software. View the full text of the exception in file @@ -16,8 +16,6 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # -# http://creativecommons.org/licenses/GPL/2.0/ -# # $Id: srcfiles.in 7 2007-02-03 13:34:17Z gburd $ diff --git a/dist/win_config.in b/dist/win_config.in deleted file mode 100644 index 76812c1..0000000 --- a/dist/win_config.in +++ /dev/null @@ -1,418 +0,0 @@ -/* Define to 1 if you want to build a version for running the test suite. */ -/* #undef CONFIG_TEST */ - -/* We use DBSQL_WIN32 much as one would use _WIN32 -- to specify that we're using - an operating system environment that supports Win32 calls and semantics. We - don't use _WIN32 because Cygwin/GCC also defines _WIN32, even though - Cygwin/GCC closely emulates the Unix environment. */ -#define DBSQL_WIN32 1 - -/* Define to 1 if you want a debugging version. */ -/* #undef DEBUG */ -#if defined(_DEBUG) -#if !defined(DEBUG) -#define DEBUG 1 -#endif -#endif - -/* Define to 1 if you want a version that logs read operations. */ -/* #undef DEBUG_ROP */ - -/* Define to 1 if you want a version that logs write operations. */ -/* #undef DEBUG_WOP */ - -/* Define to 1 if you want a version with run-time diagnostic checking. */ -/* #undef DIAGNOSTIC */ - -/* Define to 1 if you have the `clock_gettime' function. */ -/* #undef HAVE_CLOCK_GETTIME */ - -/* Define to 1 if Berkeley DB release includes strong cryptography. */ -#ifndef HAVE_SMALLBUILD -#define HAVE_CRYPTO 1 -#endif - -/* Define to 1 if you have the `directio' function. */ -/* #undef HAVE_DIRECTIO */ - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef HAVE_DIRENT_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Define to 1 if you have EXIT_SUCCESS/EXIT_FAILURE #defines. */ -#define HAVE_EXIT_SUCCESS 1 - -/* Define to 1 if fcntl/F_SETFD denies child access to file descriptors. */ -/* #undef HAVE_FCNTL_F_SETFD */ - -/* Define to 1 if allocated filesystem blocks are not zeroed. */ -#define HAVE_FILESYSTEM_NOTZERO 1 - -/* Define to 1 if you have the `getcwd' function. */ -#define HAVE_GETCWD 1 - -/* Define to 1 if you have the `getopt' function. */ -/* #undef HAVE_GETOPT */ - -/* Define to 1 if you have the `getrusage' function. */ -/* #undef HAVE_GETRUSAGE */ - -/* Define to 1 if you have the `gettimeofday' function. */ -/* #undef HAVE_GETTIMEOFDAY */ - -/* Define to 1 if you have the `getuid' function. */ -/* #undef HAVE_GETUID */ - -/* Define to 1 if building Hash access method. */ -#ifndef HAVE_SMALLBUILD -#define HAVE_HASH 1 -#endif - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_INTTYPES_H */ - -/* Define to 1 if you have the `nsl' library (-lnsl). */ -/* #undef HAVE_LIBNSL */ - -/* Define to 1 if you have the `memcmp' function. */ -#define HAVE_MEMCMP 1 - -/* Define to 1 if you have the `memcpy' function. */ -#define HAVE_MEMCPY 1 - -/* Define to 1 if you have the `memmove' function. */ -#define HAVE_MEMMOVE 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `mlock' function. */ -/* #undef HAVE_MLOCK */ - -/* Define to 1 if you have the `mmap' function. */ -/* #undef HAVE_MMAP */ - -/* Define to 1 if you have the `munlock' function. */ -/* #undef HAVE_MUNLOCK */ - -/* Define to 1 if you have the `munmap' function. */ -/* #undef HAVE_MUNMAP */ - -/* Define to 1 to use the GCC compiler and 68K assembly language mutexes. */ -/* #undef HAVE_MUTEX_68K_GCC_ASSEMBLY */ - -/* Define to 1 to use the AIX _check_lock mutexes. */ -/* #undef HAVE_MUTEX_AIX_CHECK_LOCK */ - -/* Define to 1 to use the GCC compiler and Alpha assembly language mutexes. */ -/* #undef HAVE_MUTEX_ALPHA_GCC_ASSEMBLY */ - -/* Define to 1 to use the GCC compiler and ARM assembly language mutexes. */ -/* #undef HAVE_MUTEX_ARM_GCC_ASSEMBLY */ - -/* Define to 1 to use the Apple/Darwin _spin_lock_try mutexes. */ -/* #undef HAVE_MUTEX_DARWIN_SPIN_LOCK_TRY */ - -/* Define to 1 to use the UNIX fcntl system call mutexes. */ -/* #undef HAVE_MUTEX_FCNTL */ - -/* Define to 1 to use the GCC compiler and PaRisc assembly language mutexes. - */ -/* #undef HAVE_MUTEX_HPPA_GCC_ASSEMBLY */ - -/* Define to 1 to use the msem_XXX mutexes on HP-UX. */ -/* #undef HAVE_MUTEX_HPPA_MSEM_INIT */ - -/* Define to 1 to use the GCC compiler and IA64 assembly language mutexes. */ -/* #undef HAVE_MUTEX_IA64_GCC_ASSEMBLY */ - -/* Define to 1 to use the msem_XXX mutexes on systems other than HP-UX. */ -/* #undef HAVE_MUTEX_MSEM_INIT */ - -/* Define to 1 to use the GCC compiler and PowerPC assembly language mutexes. - */ -/* #undef HAVE_MUTEX_PPC_GCC_ASSEMBLY */ - -/* Define to 1 to use POSIX 1003.1 pthread_XXX mutexes. */ -/* #undef HAVE_MUTEX_PTHREADS */ - -/* Define to 1 to use Reliant UNIX initspin mutexes. */ -/* #undef HAVE_MUTEX_RELIANTUNIX_INITSPIN */ - -/* Define to 1 to use the IBM C compiler and S/390 assembly language mutexes. - */ -/* #undef HAVE_MUTEX_S390_CC_ASSEMBLY */ - -/* Define to 1 to use the GCC compiler and S/390 assembly language mutexes. */ -/* #undef HAVE_MUTEX_S390_GCC_ASSEMBLY */ - -/* Define to 1 to use the SCO compiler and x86 assembly language mutexes. */ -/* #undef HAVE_MUTEX_SCO_X86_CC_ASSEMBLY */ - -/* Define to 1 to use the obsolete POSIX 1003.1 sema_XXX mutexes. */ -/* #undef HAVE_MUTEX_SEMA_INIT */ - -/* Define to 1 to use the SGI XXX_lock mutexes. */ -/* #undef HAVE_MUTEX_SGI_INIT_LOCK */ - -/* Define to 1 to use the Solaris _lock_XXX mutexes. */ -/* #undef HAVE_MUTEX_SOLARIS_LOCK_TRY */ - -/* Define to 1 to use the Solaris lwp threads mutexes. */ -/* #undef HAVE_MUTEX_SOLARIS_LWP */ - -/* Define to 1 to use the GCC compiler and Sparc assembly language mutexes. */ -/* #undef HAVE_MUTEX_SPARC_GCC_ASSEMBLY */ - -/* Define to 1 if mutexes hold system resources. */ -/* #undef HAVE_MUTEX_SYSTEM_RESOURCES */ - -/* Define to 1 if fast mutexes are available. */ -#define HAVE_MUTEX_THREADS 1 - -/* Define to 1 to configure mutexes intra-process only. */ -/* #undef HAVE_MUTEX_THREAD_ONLY */ - -/* Define to 1 to use the CC compiler and Tru64 assembly language mutexes. */ -/* #undef HAVE_MUTEX_TRU64_CC_ASSEMBLY */ - -/* Define to 1 to use the UNIX International mutexes. */ -/* #undef HAVE_MUTEX_UI_THREADS */ - -/* Define to 1 to use the UTS compiler and assembly language mutexes. */ -/* #undef HAVE_MUTEX_UTS_CC_ASSEMBLY */ - -/* Define to 1 to use VMS mutexes. */ -/* #undef HAVE_MUTEX_VMS */ - -/* Define to 1 to use VxWorks mutexes. */ -/* #undef HAVE_MUTEX_VXWORKS */ - -/* Define to 1 to use the MSVC compiler and Windows mutexes. */ -#define HAVE_MUTEX_WIN32 1 - -/* Define to 1 to use the GCC compiler and Windows mutexes. */ -/* #undef HAVE_MUTEX_WIN32_GCC */ - -/* Define to 1 to use the GCC compiler and x86 assembly language mutexes. */ -/* #undef HAVE_MUTEX_X86_GCC_ASSEMBLY */ - -/* Define to 1 if you have the header file, and it defines `DIR'. */ -/* #undef HAVE_NDIR_H */ - -/* Define to 1 if you have the O_DIRECT flag. */ -/* #undef HAVE_O_DIRECT */ - -/* Define to 1 if you have the `pread' function. */ -/* #undef HAVE_PREAD */ - -/* Define to 1 if you have the `pstat_getdynamic' function. */ -/* #undef HAVE_PSTAT_GETDYNAMIC */ - -/* Define to 1 if you have the `pwrite' function. */ -/* #undef HAVE_PWRITE */ - -/* Define to 1 if building on QNX. */ -/* #undef HAVE_QNX */ - -/* Define to 1 if building Queue access method. */ -#ifndef HAVE_SMALLBUILD -#define HAVE_QUEUE 1 -#endif - -/* Define to 1 if you have the `raise' function. */ -#define HAVE_RAISE 1 - -/* Define to 1 if building replication support. */ -#ifndef HAVE_SMALLBUILD -#define HAVE_REPLICATION 1 -#endif - -/* Define to 1 if building RPC client/server. */ -/* #undef HAVE_RPC */ - -/* Define to 1 if you have the `sched_yield' function. */ -/* #undef HAVE_SCHED_YIELD */ - -/* Define to 1 if you have the `select' function. */ -/* #undef HAVE_SELECT */ - -/* Define to 1 if you have the `shmget' function. */ -/* #undef HAVE_SHMGET */ - -/* Define to 1 if you have the `snprintf' function. */ -#define HAVE_SNPRINTF 1 - -/* Define to 1 if building statistics support. */ -#define HAVE_STATISTICS 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_STDINT_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the `strcasecmp' function. */ -/* #undef HAVE_STRCASECMP */ - -/* Define to 1 if you have the `strdup' function. */ -#define HAVE_STRDUP 1 - -/* Define to 1 if you have the `strerror' function. */ -#define HAVE_STRERROR 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the `strtoul' function. */ -#define HAVE_STRTOUL 1 - -/* Define to 1 if `st_blksize' is member of `struct stat'. */ -/* #undef HAVE_STRUCT_STAT_ST_BLKSIZE */ - -/* Define to 1 if you have the `sysconf' function. */ -/* #undef HAVE_SYSCONF */ - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_DIR_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_FCNTL_H 1 - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_NDIR_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_SELECT_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_TIME_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_UNISTD_H */ - -/* Define to 1 if unlink of file with open file descriptors will fail. */ -/* #undef HAVE_UNLINK_WITH_OPEN_FAILURE */ - -/* Define to 1 if building access method verification support. */ -#ifndef HAVE_SMALLBUILD -#define HAVE_VERIFY 1 -#endif - -/* Define to 1 if you have the `vsnprintf' function. */ -#define HAVE_VSNPRINTF 1 - -/* Define to 1 if building VxWorks. */ -/* #undef HAVE_VXWORKS */ - -/* Define to 1 if you have the `yield' function. */ -/* #undef HAVE_YIELD */ - -/* Define to 1 if you have the `_fstati64' function. */ -#define HAVE__FSTATI64 1 - -/* Define to a value if using non-standard mutex alignment. */ -/* #undef MUTEX_ALIGN */ - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "support@dbsql.org" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "DBSQL" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "DBSQL __EDIT_DBSQL_VERSION__" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "db-__EDIT_DBSQL_VERSION__" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "__EDIT_DBSQL_VERSION__" - -/* Define to 1 if the `S_IS*' macros in do not work properly. */ -/* #undef STAT_MACROS_BROKEN */ - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define to 1 if you can safely include both and . */ -/* #undef TIME_WITH_SYS_TIME */ - -/* Define to 1 to mask harmless unitialized memory read/writes. */ -/* #undef UMRW */ - -/* Number of bits in a file offset, on hosts where this is settable. */ -/* #undef _FILE_OFFSET_BITS */ - -/* Define for large files, on AIX-style hosts. */ -/* #undef _LARGE_FILES */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* - * Exit success/failure macros. - */ -#ifndef HAVE_EXIT_SUCCESS -#define EXIT_FAILURE 1 -#define EXIT_SUCCESS 0 -#endif - -/* - * Don't step on the namespace. Other libraries may have their own - * implementations of these functions, we don't want to use their - * implementations or force them to use ours based on the load order. - */ -#ifndef HAVE_GETCWD -#define getcwd __db_Cgetcwd -#endif -#ifndef HAVE_MEMCMP -#define memcmp __db_Cmemcmp -#endif -#ifndef HAVE_MEMCPY -#define memcpy __db_Cmemcpy -#endif -#ifndef HAVE_MEMMOVE -#define memmove __db_Cmemmove -#endif -#ifndef HAVE_RAISE -#define raise __db_Craise -#endif -#ifndef HAVE_SNPRINTF -#define snprintf __db_Csnprintf -#endif -#ifndef HAVE_STRCASECMP -#define strcasecmp __db_Cstrcasecmp -#define strncasecmp __db_Cstrncasecmp -#endif -#ifndef HAVE_STRERROR -#define strerror __db_Cstrerror -#endif -#ifndef HAVE_VSNPRINTF -#define vsnprintf __db_Cvsnprintf -#endif - -#include "win_db.h" - -/* - * Microsoft's compiler _doesn't_ define __STDC__ unless you invoke it with - * arguments turning OFF all vendor extensions. Even more unfortunately, if - * we do that, it fails to parse windows.h!!!!! So, we define __STDC__ here, - * after windows.h comes in. Note: the compiler knows we've defined it, and - * starts enforcing strict ANSI compilance from this point on. - */ -#define __STDC__ 1 diff --git a/dist/win_dbsql.in b/dist/win_dbsql.in deleted file mode 100644 index 63d56ae..0000000 --- a/dist/win_dbsql.in +++ /dev/null @@ -1,60 +0,0 @@ -/*- - * $Id: win_dbsql.in 7 2007-02-03 13:34:17Z gburd $ - * - * The following provides the information necessary to build Berkeley - * DB on native Windows, and other Windows environments such as MinGW. - */ - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* - * To build Tcl interface libraries, the include path must be configured to - * use the directory containing , usually the include directory in - * the Tcl distribution. - */ -#ifdef DB_TCL_SUPPORT -#include -#endif - -#define WIN32_LEAN_AND_MEAN -#include - -/* - * All of the necessary includes have been included, ignore the #includes - * in the Berkeley DB source files. - */ -#define NO_SYSTEM_INCLUDES - -/* - * Win32 has getcwd, snprintf and vsnprintf, but under different names. - */ -#define getcwd(buf, size) _getcwd(buf, size) -#define snprintf _snprintf -#define vsnprintf _vsnprintf - -/* - * Win32 does not define getopt and friends in any header file, so we must. - */ -#if defined(__cplusplus) -extern "C" { -#endif -extern int optind; -extern char *optarg; -extern int getopt(int, char * const *, const char *); -#if defined(__cplusplus) -} -#endif diff --git a/dist/win_exports.in b/dist/win_exports.in deleted file mode 100644 index 74ae9cd..0000000 --- a/dist/win_exports.in +++ /dev/null @@ -1,136 +0,0 @@ -# $Id: win_exports.in 7 2007-02-03 13:34:17Z gburd $ - -# Standard interfaces. - db_create - db_env_create - db_strerror - db_version - db_xa_switch - log_compare - -# Library configuration interfaces. - db_env_set_func_close - db_env_set_func_dirfree - db_env_set_func_dirlist - db_env_set_func_exists - db_env_set_func_free - db_env_set_func_fsync - db_env_set_func_ioinfo - db_env_set_func_malloc - db_env_set_func_map - db_env_set_func_open - db_env_set_func_pread - db_env_set_func_pwrite - db_env_set_func_read - db_env_set_func_realloc - db_env_set_func_rename - db_env_set_func_seek - db_env_set_func_sleep - db_env_set_func_unlink - db_env_set_func_unmap - db_env_set_func_write - db_env_set_func_yield - -# Needed for application-specific logging and recovery routines. - __db_add_recovery - -# These are needed to link the tcl library. - __db_dbm_close - __db_dbm_delete - __db_dbm_fetch - __db_dbm_firstkey - __db_dbm_init - __db_dbm_nextkey - __db_dbm_store - __db_hcreate - __db_hdestroy - __db_hsearch - __db_loadme - __db_ndbm_clearerr - __db_ndbm_close - __db_ndbm_delete - __db_ndbm_dirfno - __db_ndbm_error - __db_ndbm_fetch - __db_ndbm_firstkey - __db_ndbm_nextkey - __db_ndbm_open - __db_ndbm_pagfno - __db_ndbm_rdonly - __db_ndbm_store - __db_panic - __db_r_attach - __db_r_detach - __db_win32_mutex_init - __db_win32_mutex_lock - __db_win32_mutex_unlock - __ham_func2 - __ham_func3 - __ham_func4 - __ham_func5 - __ham_test - __lock_id_set - __os_calloc - __os_closehandle - __os_free - __os_ioinfo - __os_malloc - __os_open - __os_openhandle - __os_read - __os_realloc - __os_strdup - __os_umalloc - __os_write - __txn_id_set - -#These are needed for linking tools or java. - __bam_init_print - __bam_pgin - __bam_pgout - __crdel_init_print - __db_dispatch - __db_dump - __db_err - __db_getlong - __db_getulong - __db_global_values - __db_init_print - __db_inmemdbflags - __db_isbigendian - __db_omode - __db_overwrite - __db_pgin - __db_pgout - __db_pr_callback - __db_prdbt - __db_prfooter - __db_prheader - __db_rpath - __db_stat_pp - __db_stat_print_pp - __db_util_cache - __db_util_interrupted - __db_util_logset - __db_util_siginit - __db_util_sigresend - __db_verify_internal - __dbreg_init_print - __fop_init_print - __ham_get_meta - __ham_init_print - __ham_pgin - __ham_pgout - __ham_release_meta - __log_stat_pp - __os_clock - __os_get_errno - __os_id - __os_set_errno - __os_sleep - __os_ufree - __os_yield - __qam_init_print - __qam_pgin_out - __rep_stat_print - __txn_init_print diff --git a/src/api.c b/src/api.c index bcc921f..fe8152d 100644 --- a/src/api.c +++ b/src/api.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 DBSQL Group, Inc - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: api.c 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/api_table.c b/src/api_table.c index 2ab17ac..8558ac8 100644 --- a/src/api_table.c +++ b/src/api_table.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: api_table.c 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/cg_attach.c b/src/cg_attach.c index 0e5dc67..e579178 100644 --- a/src/cg_attach.c +++ b/src/cg_attach.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: cg_attach.c 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/cg_auth.c b/src/cg_auth.c index c5f9009..3a98c3e 100644 --- a/src/cg_auth.c +++ b/src/cg_auth.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: cg_auth.c 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/cg_build.c b/src/cg_build.c index 08de3a3..dde3849 100644 --- a/src/cg_build.c +++ b/src/cg_build.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: cg_build.c 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/cg_copy.c b/src/cg_copy.c index 06d47a8..b7511e8 100644 --- a/src/cg_copy.c +++ b/src/cg_copy.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: cg_copy.c 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/cg_date.c b/src/cg_date.c index 46e9d57..196885e 100644 --- a/src/cg_date.c +++ b/src/cg_date.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: cg_date.c 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/cg_delete.c b/src/cg_delete.c index ad8168c..c03ee58 100644 --- a/src/cg_delete.c +++ b/src/cg_delete.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: cg_delete.c 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/cg_expr.c b/src/cg_expr.c index 6368d0a..b6862ec 100644 --- a/src/cg_expr.c +++ b/src/cg_expr.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: cg_expr.c 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/cg_insert.c b/src/cg_insert.c index 60ae9d8..0ff404f 100644 --- a/src/cg_insert.c +++ b/src/cg_insert.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: cg_insert.c 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/cg_pragma.c b/src/cg_pragma.c index bf4a085..b051151 100644 --- a/src/cg_pragma.c +++ b/src/cg_pragma.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: cg_pragma.c 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/cg_select.c b/src/cg_select.c index 4712562..da07880 100644 --- a/src/cg_select.c +++ b/src/cg_select.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: cg_select.c 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/cg_trigger.c b/src/cg_trigger.c index 4ec3474..b6ce5a3 100644 --- a/src/cg_trigger.c +++ b/src/cg_trigger.c @@ -3,10 +3,14 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. + * + * There are special exceptions to the terms and conditions of the GPL as it + * is applied to this software. View the full text of the exception in file + * LICENSE_EXCEPTIONS in the directory of this software distribution. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/cg_update.c b/src/cg_update.c index f50642d..c33fa5a 100644 --- a/src/cg_update.c +++ b/src/cg_update.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: cg_update.c 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/cg_vacuum.c b/src/cg_vacuum.c index 5b10768..6acf764 100644 --- a/src/cg_vacuum.c +++ b/src/cg_vacuum.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: cg_vacuum.c 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/cg_where.c b/src/cg_where.c index cd19604..8932b2b 100644 --- a/src/cg_where.c +++ b/src/cg_where.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: cg_where.c 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/clib/getopt.c b/src/clib/getopt.c index e32d8db..ab6a7b9 100644 --- a/src/clib/getopt.c +++ b/src/clib/getopt.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: getopt.c 7 2007-02-03 13:34:17Z gburd $ */ /* diff --git a/src/clib/memcmp.c b/src/clib/memcmp.c index 45fbf70..700e03d 100644 --- a/src/clib/memcmp.c +++ b/src/clib/memcmp.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: memcmp.c 7 2007-02-03 13:34:17Z gburd $ */ /* diff --git a/src/clib/random.c b/src/clib/random.c index 9afeda8..c5c4677 100644 --- a/src/clib/random.c +++ b/src/clib/random.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -16,8 +16,6 @@ * 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. - * - * http://creativecommons.org/licenses/GPL/2.0/ */ /* * Copyright (c) 1990-2004 diff --git a/src/clib/snprintf.c b/src/clib/snprintf.c index b13c0ce..f50d5a7 100644 --- a/src/clib/snprintf.c +++ b/src/clib/snprintf.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -16,8 +16,6 @@ * 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. - * - * http://creativecommons.org/licenses/GPL/2.0/ */ /* * Copyright (c) 1990-2004 diff --git a/src/clib/strcasecmp.c b/src/clib/strcasecmp.c index b8262a8..fb683db 100644 --- a/src/clib/strcasecmp.c +++ b/src/clib/strcasecmp.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -16,8 +16,6 @@ * 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. - * - * http://creativecommons.org/licenses/GPL/2.0/ */ /* * Copyright (c) 1987, 1993 diff --git a/src/clib/strdup.c b/src/clib/strdup.c index ae00cfa..b08bff3 100644 --- a/src/clib/strdup.c +++ b/src/clib/strdup.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -16,8 +16,6 @@ * 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. - * - * http://creativecommons.org/licenses/GPL/2.0/ */ /* * Copyright (c) 1988, 1993 diff --git a/src/clib/xvprintf.c b/src/clib/xvprintf.c index a88cfa7..dcf5007 100644 --- a/src/clib/xvprintf.c +++ b/src/clib/xvprintf.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: xvprintf.c 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/common/dbsql_alloc.c b/src/common/dbsql_alloc.c index 100709c..e7128cc 100644 --- a/src/common/dbsql_alloc.c +++ b/src/common/dbsql_alloc.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: dbsql_alloc.c 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/common/dbsql_atof.c b/src/common/dbsql_atof.c index 6494872..e6406fc 100644 --- a/src/common/dbsql_atof.c +++ b/src/common/dbsql_atof.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: dbsql_atof.c 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/common/dbsql_atoi.c b/src/common/dbsql_atoi.c index cdc3cb5..b188eae 100644 --- a/src/common/dbsql_atoi.c +++ b/src/common/dbsql_atoi.c @@ -3,18 +3,20 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. + * + * There are special exceptions to the terms and conditions of the GPL as it + * is applied to this software. View the full text of the exception in file + * LICENSE_EXCEPTIONS in the directory of this software distribution. * * This library 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. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: dbsql_atoi.c 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/common/dbsql_err.c b/src/common/dbsql_err.c index 8df791a..d38ab47 100644 --- a/src/common/dbsql_err.c +++ b/src/common/dbsql_err.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: dbsql_err.c 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/common/hash.c b/src/common/hash.c index e0bf87d..5496686 100644 --- a/src/common/hash.c +++ b/src/common/hash.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: hash.c 7 2007-02-03 13:34:17Z gburd $ */ /* diff --git a/src/common/str.c b/src/common/str.c index 98a2fb0..3f2f168 100644 --- a/src/common/str.c +++ b/src/common/str.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: str.c 7 2007-02-03 13:34:17Z gburd $ */ /* diff --git a/src/dbsql.in b/src/dbsql.in index baeff9d..7de3b83 100644 --- a/src/dbsql.in +++ b/src/dbsql.in @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -16,8 +16,6 @@ * 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. - * - * http://creativecommons.org/licenses/GPL/2.0/ * * $Id: dbsql.in 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/dbsql/dbsql.c b/src/dbsql/dbsql.c index afacafb..ce02397 100644 --- a/src/dbsql/dbsql.c +++ b/src/dbsql/dbsql.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,9 +17,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: dbsql.c 7 2007-02-03 13:34:17Z gburd $ + * */ diff --git a/src/dbsql_tclsh.c b/src/dbsql_tclsh.c index e4e9f95..5f36603 100644 --- a/src/dbsql_tclsh.c +++ b/src/dbsql_tclsh.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: dbsql_tclsh.c 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/inc/db_int.h b/src/inc/db_int.h index d169291..556b2c8 100644 --- a/src/inc/db_int.h +++ b/src/inc/db_int.h @@ -3,18 +3,20 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. + * + * There are special exceptions to the terms and conditions of the GPL as it + * is applied to this software. View the full text of the exception in file + * LICENSE_EXCEPTIONS in the directory of this software distribution. * * This library 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. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: db_int.h 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/inc/dbsql_int.in b/src/inc/dbsql_int.in index 35a9f3f..9c9b9b4 100644 --- a/src/inc/dbsql_int.in +++ b/src/inc/dbsql_int.in @@ -3,18 +3,20 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. + * + * There are special exceptions to the terms and conditions of the GPL as it + * is applied to this software. View the full text of the exception in file + * LICENSE_EXCEPTIONS in the directory of this software distribution. * * This library 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. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: dbsql_int.in 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/inc/hash.h b/src/inc/hash.h index 7043f9f..1ef3a3c 100644 --- a/src/inc/hash.h +++ b/src/inc/hash.h @@ -3,18 +3,20 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. + * + * There are special exceptions to the terms and conditions of the GPL as it + * is applied to this software. View the full text of the exception in file + * LICENSE_EXCEPTIONS in the directory of this software distribution. * * This library 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. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: hash.h 7 2007-02-03 13:34:17Z gburd $ */ /* diff --git a/src/inc/random.h b/src/inc/random.h index 9dfaa30..3d0f61b 100644 --- a/src/inc/random.h +++ b/src/inc/random.h @@ -1,8 +1,21 @@ /*- - * See the file LICENSE for redistribution information. + * DBSQL - A SQL database engine. * - * Copyright (c) 2004 - * Sleepycat Software. All rights reserved. + * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. + * + * This library 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 3 of the License, or + * (at your option) any later version. + * + * There are special exceptions to the terms and conditions of the GPL as it + * is applied to this software. View the full text of the exception in file + * LICENSE_EXCEPTIONS in the directory of this software distribution. + * + * This library 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. * * $Id: random.h 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/inc/str.h b/src/inc/str.h index 9811434..5722b8b 100644 --- a/src/inc/str.h +++ b/src/inc/str.h @@ -3,18 +3,20 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. + * + * There are special exceptions to the terms and conditions of the GPL as it + * is applied to this software. View the full text of the exception in file + * LICENSE_EXCEPTIONS in the directory of this software distribution. * * This library 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. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: str.h 7 2007-02-03 13:34:17Z gburd $ */ /* diff --git a/src/inc/vdbe.h b/src/inc/vdbe.h index 254b43e..fa22444 100644 --- a/src/inc/vdbe.h +++ b/src/inc/vdbe.h @@ -3,18 +3,20 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. + * + * There are special exceptions to the terms and conditions of the GPL as it + * is applied to this software. View the full text of the exception in file + * LICENSE_EXCEPTIONS in the directory of this software distribution. * * This library 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. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: vdbe.h 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/inc/vdbe_int.h b/src/inc/vdbe_int.h index 5e0740f..079b4c5 100644 --- a/src/inc/vdbe_int.h +++ b/src/inc/vdbe_int.h @@ -3,18 +3,20 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. + * + * There are special exceptions to the terms and conditions of the GPL as it + * is applied to this software. View the full text of the exception in file + * LICENSE_EXCEPTIONS in the directory of this software distribution. * * This library 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. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: vdbe_int.h 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/inc/xvprintf.h b/src/inc/xvprintf.h index 996f801..d50f2c1 100644 --- a/src/inc/xvprintf.h +++ b/src/inc/xvprintf.h @@ -3,18 +3,20 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. + * + * There are special exceptions to the terms and conditions of the GPL as it + * is applied to this software. View the full text of the exception in file + * LICENSE_EXCEPTIONS in the directory of this software distribution. * * This library 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. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: xvprintf.h 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/lemon/lemon.c b/src/lemon/lemon.c index e257bb0..2aeb11a 100644 --- a/src/lemon/lemon.c +++ b/src/lemon/lemon.c @@ -1,11 +1,32 @@ +/*- + * Lempar - The LEMON parser generator. + * + * Copyright (C) 2007 DBSQL Group, Inc - All rights reserved. + * + * This library 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 3 of the License, or + * (at your option) any later version. + * + * There are special exceptions to the terms and conditions of the GPL as it + * is applied to this software. View the full text of the exception in file + * LICENSE_EXCEPTIONS in the directory of this software distribution. + * + * This library 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. + * + * $Id: $ + */ + /* -** This file contains all sources (including headers) to the LEMON -** LALR(1) parser generator. The sources have been combined into a -** single file to make it easy to include LEMON in the source tree -** and Makefile of another program. -** -** The author of this program disclaims copyright. -*/ + * This file contains all sources (including headers) to the LEMON + * LALR(1) parser generator. The sources have been combined into a + * single file to make it easy to include LEMON in the source tree + * and Makefile of another program. + */ + #include #include #include diff --git a/src/lemon/lempar.c b/src/lemon/lempar.c index 47cec44..964ee68 100644 --- a/src/lemon/lempar.c +++ b/src/lemon/lempar.c @@ -1,6 +1,29 @@ +/*- + * Lempar - The LEMON parser generator. + * + * Copyright (C) 2007 DBSQL Group, Inc - All rights reserved. + * + * This library 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 3 of the License, or + * (at your option) any later version. + * + * There are special exceptions to the terms and conditions of the GPL as it + * is applied to this software. View the full text of the exception in file + * LICENSE_EXCEPTIONS in the directory of this software distribution. + * + * This library 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. + * + * $Id: $ + */ + /* Driver template for the LEMON parser generator. -** The author disclaims copyright to this source code. -*/ + * The author disclaims copyright to this source code. + */ + /* First off, code is include which follows the "include" declaration ** in the input file. */ #include diff --git a/src/os/os_jtime.c b/src/os/os_jtime.c index bfcb8a1..fc96e69 100644 --- a/src/os/os_jtime.c +++ b/src/os/os_jtime.c @@ -3,10 +3,10 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. * * There are special exceptions to the terms and conditions of the GPL as it * is applied to this software. View the full text of the exception in file @@ -17,8 +17,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * http://creativecommons.org/licenses/GPL/2.0/ - * * $Id: os_jtime.c 7 2007-02-03 13:34:17Z gburd $ */ diff --git a/src/py/extended_setup.py b/src/py/extended_setup.py index adee5c4..9ba043d 100644 --- a/src/py/extended_setup.py +++ b/src/py/extended_setup.py @@ -1,14 +1,13 @@ -#-*- coding: ISO-8859-1 -*- # ext_setup.py: setuptools extensions for the distutils script # # DBSQL - A SQL database engine. # # Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. # -# This library 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.1 of the License, or (at your option) any later version. +# This library 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 3 of the License, or +# (at your option) any later version. # # There are special exceptions to the terms and conditions of the GPL as it # is applied to this software. View the full text of the exception in file @@ -19,8 +18,6 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # -# http://creativecommons.org/licenses/GPL/2.0/ -# # Copyright (C) 2004-2006 Gerhard Häring # # This software is provided 'as-is', without any express or implied diff --git a/src/py/setup.py.in b/src/py/setup.py.in index 3b53eef..68a8d13 100644 --- a/src/py/setup.py.in +++ b/src/py/setup.py.in @@ -1,14 +1,13 @@ -#-*- coding: ISO-8859-1 -*- # setup.py: the distutils script # # DBSQL - A SQL database engine. # # Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. # -# This library 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.1 of the License, or (at your option) any later version. +# This library 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 3 of the License, or +# (at your option) any later version. # # There are special exceptions to the terms and conditions of the GPL as it # is applied to this software. View the full text of the exception in file @@ -19,8 +18,6 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # -# http://creativecommons.org/licenses/GPL/2.0/ -# # Copyright (C) 2004-2006 Gerhard Häring # # This software is provided 'as-is', without any express or implied diff --git a/src/safety.c b/src/safety.c index 877d9d7..01459b6 100644 --- a/src/safety.c +++ b/src/safety.c @@ -3,10 +3,14 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. + * + * There are special exceptions to the terms and conditions of the GPL as it + * is applied to this software. View the full text of the exception in file + * LICENSE_EXCEPTIONS in the directory of this software distribution. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/sm.c b/src/sm.c index 026cf6e..4aabb75 100644 --- a/src/sm.c +++ b/src/sm.c @@ -3,10 +3,14 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. + * + * There are special exceptions to the terms and conditions of the GPL as it + * is applied to this software. View the full text of the exception in file + * LICENSE_EXCEPTIONS in the directory of this software distribution. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/sql_fns.c b/src/sql_fns.c index 0d37b82..af3d14e 100644 --- a/src/sql_fns.c +++ b/src/sql_fns.c @@ -3,10 +3,14 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. + * + * There are special exceptions to the terms and conditions of the GPL as it + * is applied to this software. View the full text of the exception in file + * LICENSE_EXCEPTIONS in the directory of this software distribution. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/sql_parser.y b/src/sql_parser.y index 114e93a..bccb1a6 100644 --- a/src/sql_parser.y +++ b/src/sql_parser.y @@ -3,10 +3,14 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. + * + * There are special exceptions to the terms and conditions of the GPL as it + * is applied to this software. View the full text of the exception in file + * LICENSE_EXCEPTIONS in the directory of this software distribution. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/sql_tokenize.c b/src/sql_tokenize.c index 4aa5239..c2b9760 100644 --- a/src/sql_tokenize.c +++ b/src/sql_tokenize.c @@ -3,10 +3,14 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. + * + * There are special exceptions to the terms and conditions of the GPL as it + * is applied to this software. View the full text of the exception in file + * LICENSE_EXCEPTIONS in the directory of this software distribution. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/vdbe.c b/src/vdbe.c index 7ce5296..f17cdc5 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -3,10 +3,14 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. + * + * There are special exceptions to the terms and conditions of the GPL as it + * is applied to this software. View the full text of the exception in file + * LICENSE_EXCEPTIONS in the directory of this software distribution. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/vdbe_method.c b/src/vdbe_method.c index 38c4248..1246150 100644 --- a/src/vdbe_method.c +++ b/src/vdbe_method.c @@ -3,10 +3,14 @@ * * Copyright (C) 2007 The DBSQL Group, Inc. - All rights reserved. * - * This library 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.1 of the License, or (at your option) any later version. + * This library 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 3 of the License, or + * (at your option) any later version. + * + * There are special exceptions to the terms and conditions of the GPL as it + * is applied to this software. View the full text of the exception in file + * LICENSE_EXCEPTIONS in the directory of this software distribution. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of