You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
58 lines
1.4 KiB
58 lines
1.4 KiB
9 years ago
|
diff -Nuar a/config.c b/config.c
|
||
|
--- a/config.c 2015-03-01 11:25:37.489999902 +0100
|
||
|
+++ b/config.c 2015-03-01 11:26:31.129999901 +0100
|
||
|
@@ -1,6 +1,6 @@
|
||
|
#include "queue.h"
|
||
|
/* Alloca is defined in stdlib.h in NetBSD */
|
||
|
-#ifndef __NetBSD__
|
||
|
+#if !defined(__NetBSD__) && !defined(__FreeBSD__)
|
||
|
#include <alloca.h>
|
||
|
#endif
|
||
|
#include <limits.h>
|
||
|
@@ -24,6 +24,10 @@
|
||
|
#include <fnmatch.h>
|
||
|
#include <sys/mman.h>
|
||
|
|
||
|
+#if !defined(PATH_MAX) && defined(__FreeBSD__)
|
||
|
+#include <sys/param.h>
|
||
|
+#endif
|
||
|
+
|
||
|
#include "basenames.h"
|
||
|
#include "log.h"
|
||
|
#include "logrotate.h"
|
||
|
diff -Nuar a/logrotate.c b/logrotate.c
|
||
|
--- a/logrotate.c 2015-02-13 07:11:21.000000000 +0100
|
||
|
+++ b/logrotate.c 2015-03-01 11:27:05.769999900 +0100
|
||
|
@@ -1,6 +1,6 @@
|
||
|
#include "queue.h"
|
||
|
/* alloca() is defined in stdlib.h in NetBSD */
|
||
|
-#ifndef __NetBSD__
|
||
|
+#if !defined(__NetBSD__) && !defined(__FreeBSD__)
|
||
|
#include <alloca.h>
|
||
|
#endif
|
||
|
#include <limits.h>
|
||
|
@@ -25,6 +25,10 @@
|
||
|
#include <limits.h>
|
||
|
#endif
|
||
|
|
||
|
+#if !defined(PATH_MAX) && defined(__FreeBSD__)
|
||
|
+#include <sys/param.h>
|
||
|
+#endif
|
||
|
+
|
||
|
#include "basenames.h"
|
||
|
#include "log.h"
|
||
|
#include "logrotate.h"
|
||
|
diff -Nuar a/Makefile b/Makefile
|
||
|
--- a/Makefile 2015-02-13 07:11:21.000000000 +0100
|
||
|
+++ b/Makefile 2015-03-01 11:27:27.209999900 +0100
|
||
|
@@ -22,7 +22,9 @@
|
||
|
|
||
|
ifeq ($(WITH_ACL),yes)
|
||
|
CFLAGS += -DWITH_ACL
|
||
|
+ifneq ($(OS_NAME),FreeBSD)
|
||
|
LOADLIBES += -lacl
|
||
|
+endif
|
||
|
# See pretest
|
||
|
TEST_ACL=1
|
||
|
else
|