Module Name: src
Committed By: pooka
Date: Mon Nov 26 17:03:16 UTC 2012
Modified Files:
src/lib/librumpuser: rumpuser_port.h rumpuser_sp.c
Log Message:
FreeBSD fixes.
from phi...@freebsd.org
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/librumpuser/rumpuser_port.h
cvs rdiff -u -r1.48 -r1.49 src/lib/librumpuser/rumpuser_sp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/rumpuser_port.h
diff -u src/lib/librumpuser/rumpuser_port.h:1.7 src/lib/librumpuser/rumpuser_port.h:1.8
--- src/lib/librumpuser/rumpuser_port.h:1.7 Mon Nov 26 16:30:14 2012
+++ src/lib/librumpuser/rumpuser_port.h Mon Nov 26 17:03:15 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_port.h,v 1.7 2012/11/26 16:30:14 pooka Exp $ */
+/* $NetBSD: rumpuser_port.h,v 1.8 2012/11/26 17:03:15 pooka Exp $ */
/*
* Portability header for non-NetBSD platforms.
@@ -49,7 +49,7 @@
#include <sys/types.h>
#include <sys/param.h>
-#if defined(__linux__) || defined(__sun__)
+#if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__)
#include <errno.h>
#include <stdlib.h>
#include <string.h>
Index: src/lib/librumpuser/rumpuser_sp.c
diff -u src/lib/librumpuser/rumpuser_sp.c:1.48 src/lib/librumpuser/rumpuser_sp.c:1.49
--- src/lib/librumpuser/rumpuser_sp.c:1.48 Fri Sep 21 14:33:03 2012
+++ src/lib/librumpuser/rumpuser_sp.c Mon Nov 26 17:03:15 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_sp.c,v 1.48 2012/09/21 14:33:03 pooka Exp $ */
+/* $NetBSD: rumpuser_sp.c,v 1.49 2012/11/26 17:03:15 pooka Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -37,7 +37,7 @@
#include "rumpuser_port.h"
#if !defined(lint)
-__RCSID("$NetBSD: rumpuser_sp.c,v 1.48 2012/09/21 14:33:03 pooka Exp $");
+__RCSID("$NetBSD: rumpuser_sp.c,v 1.49 2012/11/26 17:03:15 pooka Exp $");
#endif /* !lint */
#include <sys/types.h>
@@ -117,6 +117,12 @@ getdisco(void)
return discocnt;
}
+#elif defined(__FreeBSD__)
+
+#include <machine/atomic.h>
+#define signaldisco() atomic_add_int(&disco, 1)
+#define getdisco() atomic_readandclear_int(&disco)
+
#else /* NetBSD */
#include <sys/atomic.h>
