Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Insert bits to allow successful compilation (and apparent success in

running) on FreeBSD.
  • Loading branch information...
commit 7b6452aa2d1184775e62ff6ff028ccd7c14f9d7d 1 parent 724af76
@dhobsd dhobsd authored
Showing with 11 additions and 3 deletions.
  1. +7 −1 init_lib.c
  2. +2 −0  malloc.c
  3. +1 −1  sol_compat.h
  4. +1 −1  umem.c
View
8 init_lib.c
@@ -47,6 +47,10 @@
#include <fcntl.h>
#include <string.h>
+#ifdef __FreeBSD__
+#include <machine/param.h>
+#endif
+
void
vmem_heap_init(void)
{
@@ -84,8 +88,10 @@ umem_type_init(caddr_t start, size_t len, size_t pgsize)
SYSTEM_INFO info;
GetSystemInfo(&info);
pagesize = info.dwPageSize;
-#else
+#elseif !defined(__FreeBSD__)
pagesize = _sysconf(_SC_PAGESIZE);
+#else
+ pagesize = PAGE_SIZE;
#endif
}
View
2  malloc.c
@@ -33,7 +33,9 @@
#include <string.h>
+#ifdef HAVE_SYS_SYSMACROS_H
#include <sys/sysmacros.h>
+#endif
#include "umem_base.h"
View
2  sol_compat.h
@@ -165,7 +165,7 @@ static INLINE uint_t ec_atomic_inc(uint_t *mem)
#ifdef _WIN32
#define issetugid() 0
-#else
+#elseif !defined(__FreeBSD__)
#define issetugid() (geteuid() == 0)
#endif
View
2  umem.c
@@ -518,7 +518,7 @@ umem_log_header_t *umem_failure_log;
umem_log_header_t *umem_slab_log;
extern thread_t _thr_self(void);
-#if defined(__MACH__)
+#if defined(__MACH__) || defined(__FreeBSD__)
# define CPUHINT() ((int)(_thr_self()))
#endif
Please sign in to comment.
Something went wrong with that request. Please try again.