INN commit: trunk/storage (expire.c ovinterface.h)

INN Commit rra at isc.org
Sat Nov 21 09:14:26 UTC 2020


    Date: Saturday, November 21, 2020 @ 01:14:26
  Author: iulius
Revision: 10412

Fix build with static libraries

The ACTIVE parameter is no longer shared between expire.c and ov.c,
so it no longer has to be exposed in ovinterface.h.
Its removal fixes the naming conflict with another ACTIVE parameter
in nnrpd.

Modified:
  trunk/storage/expire.c
  trunk/storage/ovinterface.h

---------------+
 expire.c      |    2 +-
 ovinterface.h |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

Modified: expire.c
===================================================================
--- expire.c	2020-11-21 09:08:40 UTC (rev 10411)
+++ expire.c	2020-11-21 09:14:26 UTC (rev 10412)
@@ -91,11 +91,11 @@
 static int              ARTfieldsize;
 static bool             ReadOverviewfmt = false;
 
+static char *           ACTIVE;
 
 /* FIXME: The following variables are shared between this file and ov.c.
    This should be cleaned up with a better internal interface. */
 time_t   OVnow;
-char *   ACTIVE;
 FILE *   EXPunlinkfile;
 bool     OVignoreselfexpire;
 bool     OVusepost;

Modified: ovinterface.h
===================================================================
--- ovinterface.h	2020-11-21 09:08:40 UTC (rev 10411)
+++ ovinterface.h	2020-11-21 09:14:26 UTC (rev 10412)
@@ -42,7 +42,6 @@
 void OVEXPcleanup(void);
 
 extern time_t OVnow;
-extern char *ACTIVE;
 extern FILE *EXPunlinkfile;
 extern bool OVignoreselfexpire;
 extern bool OVusepost;



More information about the inn-committers mailing list