fix patches

This commit is contained in:
sthen 2022-04-28 13:00:47 +00:00
parent 2ea228ac24
commit 0ef26d1388
3 changed files with 0 additions and 52 deletions

View File

@ -26,31 +26,3 @@ Index: src/fts-backend-xapian-functions.cpp
uint32_t m;
size_t len = sizeof(m);
sysctlbyname("vm.stats.vm.v_free_count", &m, &len, NULL, 0);
Index: src/fts-backend-xapian-functions.cpp
--- src/fts-backend-xapian-functions.cpp.orig
+++ src/fts-backend-xapian-functions.cpp
@@ -506,10 +506,15 @@ static long fts_backend_xapian_current_time()
static long fts_backend_xapian_get_free_memory() // KB
{
struct rlimit rl;
+
+#if !defined(__OpenBSD__)
getrlimit(RLIMIT_AS,&rl);
long limit = rl.rlim_cur / 1024.0;
if(fts_xapian_settings.verbose>1) i_warning("FTS Xapian: RLIM AS =%ld",limit);
+#else
+ long limit = 0;
+#endif
getrlimit(RLIMIT_DATA,&rl);
long l2 = rl.rlim_cur / 1024.0;
@@ -517,7 +522,7 @@ static long fts_backend_xapian_get_free_memory() // KB
if((l2>0) && ((limit>l2) || (limit<1))) limit=l2;
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
uint32_t m;
size_t len = sizeof(m);
sysctlbyname("vm.stats.vm.v_free_count", &m, &len, NULL, 0);

View File

@ -10,15 +10,3 @@ Index: src/fts-xapian-plugin.c
size_t len = sizeof(fuser->set.pagesize);
sysctlbyname("hw.pagesize", &(fuser->set.pagesize), &len, NULL, 0);
#else
Index: src/fts-xapian-plugin.c
--- src/fts-xapian-plugin.c.orig
+++ src/fts-xapian-plugin.c
@@ -35,7 +35,7 @@ static void fts_xapian_mail_user_created(struct mail_u
fuser->set.partial = XAPIAN_DEFAULT_PARTIAL;
fuser->set.full = XAPIAN_DEFAULT_FULL;
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
size_t len = sizeof(fuser->set.pagesize);
sysctlbyname("hw.pagesize", &(fuser->set.pagesize), &len, NULL, 0);
#else

View File

@ -10,15 +10,3 @@ Index: src/fts-xapian-plugin.h
#include <sys/types.h>
#include <sys/sysctl.h>
#if !defined(__APPLE__)
Index: src/fts-xapian-plugin.h
--- src/fts-xapian-plugin.h.orig
+++ src/fts-xapian-plugin.h
@@ -16,7 +16,7 @@
#include "module-context.h"
#include "fts-api-private.h"
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
#include <sys/types.h>
#include <sys/sysctl.h>
#if !defined(__APPLE__)