Ensure that there is only one variable definition per each object, as
the C (and C++) standards mandated for years and compilers started to enforce as of recently (Clang 11, GCC 10). Reported by: pkg-fallout
This commit is contained in:
parent
6bb18aedcf
commit
869c3b0d5f
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=547508
@ -1,5 +1,5 @@
|
||||
--- config.c.orig 2017-10-12 15:19:41.000000000 +0000
|
||||
+++ config.c 2017-10-14 21:59:41.716559000 +0000
|
||||
--- config.c.orig 2017-10-12 15:19:41 UTC
|
||||
+++ config.c
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "queue.h"
|
||||
/* Alloca is defined in stdlib.h in NetBSD */
|
||||
@ -8,3 +8,12 @@
|
||||
#include <alloca.h>
|
||||
#endif
|
||||
#include <limits.h>
|
||||
@@ -27,6 +27,8 @@
|
||||
|
||||
#include "log.h"
|
||||
#include "logrotate.h"
|
||||
+
|
||||
+extern struct logInfoHead logs;
|
||||
|
||||
#if !defined(GLOB_ABORTED) && defined(GLOB_ABEND)
|
||||
#define GLOB_ABORTED GLOB_ABEND
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- logrotate.c.orig 2017-10-12 15:19:41.000000000 +0000
|
||||
+++ logrotate.c 2017-10-14 22:00:57.613844000 +0000
|
||||
--- logrotate.c.orig 2017-10-12 15:19:41 UTC
|
||||
+++ logrotate.c
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "queue.h"
|
||||
/* alloca() is defined in stdlib.h in NetBSD */
|
||||
@ -8,3 +8,12 @@
|
||||
#include <alloca.h>
|
||||
#endif
|
||||
#include <limits.h>
|
||||
@@ -29,6 +29,8 @@
|
||||
|
||||
#include "log.h"
|
||||
#include "logrotate.h"
|
||||
+
|
||||
+struct logInfoHead logs;
|
||||
|
||||
static void *prev_context;
|
||||
#ifdef WITH_SELINUX
|
||||
|
11
sysutils/logrotate/files/patch-logrotate.h
Normal file
11
sysutils/logrotate/files/patch-logrotate.h
Normal file
@ -0,0 +1,11 @@
|
||||
--- logrotate.h.orig 2017-10-12 15:19:41 UTC
|
||||
+++ logrotate.h
|
||||
@@ -80,7 +80,7 @@
|
||||
TAILQ_ENTRY(logInfo) list;
|
||||
};
|
||||
|
||||
-TAILQ_HEAD(logInfoHead, logInfo) logs;
|
||||
+TAILQ_HEAD(logInfoHead, logInfo);
|
||||
|
||||
extern int numLogs;
|
||||
extern int debug;
|
Loading…
Reference in New Issue
Block a user