Module Name: src
Committed By: pooka
Date: Mon Nov 26 17:55:11 UTC 2012
Modified Files:
src/lib/librumpuser: rumpuser_dl.c rumpuser_sp.c
Log Message:
Support DragonFly BSD.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/lib/librumpuser/rumpuser_dl.c
cvs rdiff -u -r1.49 -r1.50 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_dl.c
diff -u src/lib/librumpuser/rumpuser_dl.c:1.9 src/lib/librumpuser/rumpuser_dl.c:1.10
--- src/lib/librumpuser/rumpuser_dl.c:1.9 Mon Nov 26 17:00:54 2012
+++ src/lib/librumpuser/rumpuser_dl.c Mon Nov 26 17:55:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_dl.c,v 1.9 2012/11/26 17:00:54 pooka Exp $ */
+/* $NetBSD: rumpuser_dl.c,v 1.10 2012/11/26 17:55:11 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -33,7 +33,7 @@
#include "rumpuser_port.h"
#if !defined(lint)
-__RCSID("$NetBSD: rumpuser_dl.c,v 1.9 2012/11/26 17:00:54 pooka Exp $");
+__RCSID("$NetBSD: rumpuser_dl.c,v 1.10 2012/11/26 17:55:11 pooka Exp $");
#endif /* !lint */
#include <sys/types.h>
@@ -53,7 +53,8 @@ __RCSID("$NetBSD: rumpuser_dl.c,v 1.9 20
#include <rump/rumpuser.h>
#if defined(__ELF__) && (defined(__NetBSD__) || defined(__FreeBSD__) \
- || (defined(__sun__) && defined(__svr4__))) || defined(__linux__)
+ || (defined(__sun__) && defined(__svr4__))) || defined(__linux__) \
+ || defined(__DragonFly__)
static size_t symtabsize = 0, strtabsize = 0;
static size_t symtaboff = 0, strtaboff = 0;
static uint8_t *symtab = NULL;
Index: src/lib/librumpuser/rumpuser_sp.c
diff -u src/lib/librumpuser/rumpuser_sp.c:1.49 src/lib/librumpuser/rumpuser_sp.c:1.50
--- src/lib/librumpuser/rumpuser_sp.c:1.49 Mon Nov 26 17:03:15 2012
+++ src/lib/librumpuser/rumpuser_sp.c Mon Nov 26 17:55:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_sp.c,v 1.49 2012/11/26 17:03:15 pooka Exp $ */
+/* $NetBSD: rumpuser_sp.c,v 1.50 2012/11/26 17:55:11 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.49 2012/11/26 17:03:15 pooka Exp $");
+__RCSID("$NetBSD: rumpuser_sp.c,v 1.50 2012/11/26 17:55:11 pooka Exp $");
#endif /* !lint */
#include <sys/types.h>
@@ -117,7 +117,7 @@ getdisco(void)
return discocnt;
}
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
#include <machine/atomic.h>
#define signaldisco() atomic_add_int(&disco, 1)