[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] parse-duration: Lessen the GPL
From: |
Bruce Korb |
Subject: |
[PATCH] parse-duration: Lessen the GPL |
Date: |
Fri, 08 Jun 2012 13:20:28 -0700 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20120421 Thunderbird/12.0 |
This gets included by NTP and they need a more liberal license:
From d9adda99d471074850b3563fad18fd1837397ca8 Mon Sep 17 00:00:00 2001
From: Bruce Korb <address@hidden>
Date: Fri, 8 Jun 2012 13:17:05 -0700
Subject: [PATCH] parse-duration: Lessen the GPL
* lib/parse-duration.c: mark the license as "Lesser"
* lib/parse-duration.h: likewise
* modules/parse-duration: likewise
---
lib/parse-duration.c | 14 +++++++-------
lib/parse-duration.h | 8 ++++----
modules/parse-duration | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/lib/parse-duration.c b/lib/parse-duration.c
index e49060a..5d9e9e6 100644
--- a/lib/parse-duration.c
+++ b/lib/parse-duration.c
@@ -3,16 +3,16 @@
Written by Bruce Korb <address@hidden>, 2008.
This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
+ it under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ 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 program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
@@ -54,14 +54,14 @@ typedef enum {
#define TIME_MAX 0x7FFFFFFF
/* Wrapper around strtoul that does not require a cast. */
-static unsigned long inline
+inline static unsigned long
str_const_to_ul (cch_t * str, cch_t ** ppz, int base)
{
return strtoul (str, (char **)ppz, base);
}
/* Wrapper around strtol that does not require a cast. */
-static long inline
+inline static long
str_const_to_l (cch_t * str, cch_t ** ppz, int base)
{
return strtol (str, (char **)ppz, base);
@@ -70,7 +70,7 @@ str_const_to_l (cch_t * str, cch_t ** ppz, int base)
/* Returns BASE + VAL * SCALE, interpreting BASE = BAD_TIME
with errno set as an error situation, and returning BAD_TIME
with errno set in an error situation. */
-static time_t inline
+inline static time_t
scale_n_add (time_t base, time_t val, int scale)
{
if (base == BAD_TIME)
diff --git a/lib/parse-duration.h b/lib/parse-duration.h
index caefb75..5961bc9 100644
--- a/lib/parse-duration.h
+++ b/lib/parse-duration.h
@@ -3,16 +3,16 @@
Written by Bruce Korb <address@hidden>, 2008.
This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
+ it under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ 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 program. If not, see <http://www.gnu.org/licenses/>. */
/*
diff --git a/modules/parse-duration b/modules/parse-duration
index e36c917..a0da1b3 100644
--- a/modules/parse-duration
+++ b/modules/parse-duration
@@ -17,7 +17,7 @@ Include:
"parse-duration.h"
License:
-GPL
+LGPLv2+
Maintainer:
Bruce Korb
--
1.7.7
- [PATCH] parse-duration: Lessen the GPL,
Bruce Korb <=