ipv6logconv/ipv6logconv.{h,c}: fix multiple definition of 'cache_lru_…

…limit'
pbiering · Jan 24, 2020 · 8c7eea5 · 8c7eea5
1 parent 84d8e83
commit 8c7eea5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -9,6 +9,9 @@ Info:
 	PV = Peter Volkov <pva (at) gentoo dot org>
 	AGP = Anthony G. Basile <basile at opensource dot dyc dot edu>
 --------------------------------------------------------------------
+20200124/PB:
+	ipv6logconv/ipv6logconv.{h,c}: fix multiple definition of 'cache_lru_limit'
+
 20191209/PB:
 	ipv6calcweb/ipv6calcweb.cgi[.in]: fix missing description for GeoName ID, remove unexpected GenName links
 

diff --git a/configure.in b/configure.in
@@ -7,7 +7,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(ipv6calc, 2.2.1, ipv6calc@deepspace6.net, ipv6calc, http://www.deepspace6.net/projects/ipv6calc.html)
 
-COPYRIGHT_YEAR=2019
+COPYRIGHT_YEAR=2020
 
 dnl Program/library version (align with version above)
 PACKAGE_VERSION_MAJOR=2

diff --git a/ipv6logconv/ipv6logconv.c b/ipv6logconv/ipv6logconv.c
@@ -2,7 +2,7 @@
  * Project    : ipv6calc
  * File       : ipv6logconv.c
  * Version    : $Id$
- * Copyright  : 2002-2019 by Peter Bieringer <pb (at) bieringer.de>
+ * Copyright  : 2002-2020 by Peter Bieringer <pb (at) bieringer.de>
  * 
  * Information:
  *  Dedicated program for logfile conversions
@@ -58,7 +58,7 @@ static void lineparser(const long int outputtype);
 /* LRU cache */
 
 #define CACHE_LRU_SIZE 200
-
+int cache_lru_limit;
 static int      cache_lru_max = 0;
 static int      cache_lru_last = 0;
 static char     cache_lru_key_token[CACHE_LRU_SIZE][NI_MAXHOST];

diff --git a/ipv6logconv/ipv6logconv.h b/ipv6logconv/ipv6logconv.h
@@ -2,7 +2,7 @@
  * Project    : ipv6calc
  * File       : ipv6logconv.h
  * Version    : $Id$
- * Copyright  : 2002-2014 by Peter Bieringer <pb (at) bieringer.de>
+ * Copyright  : 2002-2020 by Peter Bieringer <pb (at) bieringer.de>
  * License    : GNU GPL v2
  *
  * Information:
@@ -20,8 +20,7 @@
 #define DEBUG_ipv6logconv_general      0x00000001l
 #define DEBUG_ipv6logconv_processing   0x00000002l
 
-/* prototyping */
-int cache_lru_limit;
+extern int cache_lru_limit;
 
 extern int feature_reg;
 extern int feature_ieee;