diff --git a/LICENSE.third b/LICENSE.third index 3796eaa..69610ac 100644 --- a/LICENSE.third +++ b/LICENSE.third @@ -34,8 +34,7 @@ kbtree.h: aho_corasick_template*.h: Copyright 2017 Laurent Farhi - Licensed under the GPL-3.0. + Licensed under the LGPL-3.0. https://github.com/farhiongit/aho-corasick-1975 - Note: The developer has been contacted for a license change to the LGPL. See the respective source and/or license files for details. diff --git a/src/aho_corasick_template.h b/src/aho_corasick_template.h index 82b9d88..29f5515 100644 --- a/src/aho_corasick_template.h +++ b/src/aho_corasick_template.h @@ -4,23 +4,18 @@ * Contact: lfarhi@sfr.fr * * This file 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. +* it under the terms of the GNU Lesser General Public License as published by +* the Free Software Foundation, version 3 of the License. * * This file 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. +* GNU Lesser General Public License for more details. * -* You should have received a copy of the GNU General Public License +* You should have received a copy of the GNU Lesser General Public License * along with this file. If not, see . */ -/* - * 2021-10-06: The developer has been contacted for a license change to the LGPL. - */ - #ifndef __ACM_TEMPLATE__ # define __ACM_TEMPLATE__ @@ -340,7 +335,7 @@ struct _ac_machine_##T \ __attribute__ ((unused)) ACMachine_##T *ACM_create_##T (EQ_##T##_TYPE eq, \ COPY_##T##_TYPE copier, \ DESTROY_##T##_TYPE dtor); \ -struct __useless_struct_to_allow_trailing_semicolon__ +struct __useless_struct_to_allow_trailing_semicolon__##T##__ // END DECLARE_ACM // BEGIN MACROS diff --git a/src/aho_corasick_template_impl.h b/src/aho_corasick_template_impl.h index a6c5a45..11c8227 100644 --- a/src/aho_corasick_template_impl.h +++ b/src/aho_corasick_template_impl.h @@ -3,23 +3,18 @@ * Contact: lfarhi@sfr.fr * * This file 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. +* it under the terms of the GNU Lesser General Public License as published by +* the Free Software Foundation, version 3 of the License. * * This file 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. +* GNU Lesser General Public License for more details. * -* You should have received a copy of the GNU General Public License +* You should have received a copy of the GNU Lesser General Public License * along with this file. If not, see . */ -/* - * 2021-10-06: The developer has been contacted for a license change to the LGPL. - */ - /* * This file is modified from the original to suppress ISO C and c99 warnings * issued by both gcc and clang, such as those for _Generic selection and %n$ @@ -676,7 +671,7 @@ machine_init_##ACM_SYMBOL (ACMachine_##ACM_SYMBOL *machine, \ machine->destroy = dtor ? dtor : __DTOR_##ACM_SYMBOL; \ machine->eq = eq ? eq : __EQ_##ACM_SYMBOL; \ } \ -struct __useless_struct_to_allow_trailing_semicolon__ +struct __useless_struct_to_allow_trailing_semicolon__##T##__ // END DEFINE_ACM #endif