Skip to content

Commit d8fa37d

Browse files
anttikanteeanttikantee
committed
Merge branch 'netbsd-cvs'
2 parents 9c4695d + 32644da commit d8fa37d

File tree

7 files changed

+28
-26
lines changed

7 files changed

+28
-26
lines changed

‎lib/librumpuser/CVS/Entries

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
/Makefile/1.15/Tue Sep 10 16:51:24 2013//D2014.01.03.14.00.00
2-
/rumpuser.3/1.16/Mon Jul 22 12:36:56 2013//D2014.01.03.14.00.00
3-
/rumpuser.c/1.55/Sun Oct 27 16:39:46 2013//D2014.01.03.14.00.00
4-
/rumpuser_bio.c/1.7/Wed May 15 14:58:24 2013//D2014.01.03.14.00.00
5-
/rumpuser_component.c/1.6/Tue May 7 15:18:35 2013//D2014.01.03.14.00.00
6-
/rumpuser_component.h/1.3/Tue Apr 30 12:39:20 2013//D2014.01.03.14.00.00
7-
/rumpuser_daemonize.c/1.6/Tue May 7 15:18:35 2013//D2014.01.03.14.00.00
8-
/rumpuser_dl.c/1.25/Wed Oct 30 13:08:14 2013//D2014.01.03.14.00.00
9-
/rumpuser_errtrans.c/1.1/Tue Apr 30 12:39:20 2013//D2014.01.03.14.00.00
10-
/rumpuser_int.h/1.8/Tue Apr 30 12:39:20 2013//D2014.01.03.14.00.00
11-
/rumpuser_port.h/1.23/Wed Dec 18 20:24:04 2013//D2014.01.03.14.00.00
12-
/rumpuser_pth.c/1.34/Sun Oct 27 16:39:46 2013//D2014.01.03.14.00.00
13-
/rumpuser_pth_dummy.c/1.16/Wed May 15 14:52:49 2013//D2014.01.03.14.00.00
14-
/rumpuser_sp.c/1.61/Fri Nov 1 23:22:13 2013//D2014.01.03.14.00.00
15-
/shlib_version/1.2/Fri Mar 1 18:15:36 2013//D2014.01.03.14.00.00
16-
/sp_common.c/1.37/Tue Dec 31 00:25:17 2013//D2014.01.03.14.00.00
1+
/Makefile/1.15/Tue Sep 10 16:51:24 2013//D2014.01.08.01.50.00
2+
/rumpuser.3/1.16/Mon Jul 22 12:36:56 2013//D2014.01.08.01.50.00
3+
/rumpuser.c/1.55/Sun Oct 27 16:39:46 2013//D2014.01.08.01.50.00
4+
/rumpuser_bio.c/1.7/Wed May 15 14:58:24 2013//D2014.01.08.01.50.00
5+
/rumpuser_component.c/1.6/Tue May 7 15:18:35 2013//D2014.01.08.01.50.00
6+
/rumpuser_component.h/1.3/Tue Apr 30 12:39:20 2013//D2014.01.08.01.50.00
7+
/rumpuser_daemonize.c/1.6/Tue May 7 15:18:35 2013//D2014.01.08.01.50.00
8+
/rumpuser_dl.c/1.25/Wed Oct 30 13:08:14 2013//D2014.01.08.01.50.00
9+
/rumpuser_errtrans.c/1.1/Tue Apr 30 12:39:20 2013//D2014.01.08.01.50.00
10+
/rumpuser_int.h/1.8/Tue Apr 30 12:39:20 2013//D2014.01.08.01.50.00
11+
/rumpuser_port.h/1.25/Wed Jan 8 01:54:19 2014//D2014.01.08.01.50.00
12+
/rumpuser_pth.c/1.34/Sun Oct 27 16:39:46 2013//D2014.01.08.01.50.00
13+
/rumpuser_pth_dummy.c/1.16/Wed May 15 14:52:49 2013//D2014.01.08.01.50.00
14+
/rumpuser_sp.c/1.62/Wed Jan 8 01:54:19 2014//D2014.01.08.01.50.00
15+
/shlib_version/1.2/Fri Mar 1 18:15:36 2013//D2014.01.08.01.50.00
16+
/sp_common.c/1.38/Wed Jan 8 01:54:20 2014//D2014.01.08.01.50.00
1717
D

‎lib/librumpuser/CVS/Tag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
D2014.01.03.14.00.00
1+
D2014.01.08.01.50.00

‎lib/librumpuser/rumpuser_port.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: rumpuser_port.h,v 1.23 2013/12/18 20:24:04 pooka Exp $ */
1+
/* $NetBSD: rumpuser_port.h,v 1.25 2014/01/08 01:47:31 pooka Exp $ */
22

33
/*
44
* Portability header for non-NetBSD platforms.
@@ -92,9 +92,8 @@ clock_gettime(clockid_t clk, struct timespec *ts)
9292
#include <sys/types.h>
9393
#include <sys/param.h>
9494

95-
/* maybe this should be !__NetBSD__ ? */
96-
#if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__) \
97-
|| defined(__DragonFly__) || defined(__APPLE__) || defined(__CYGWIN__)
95+
/* NetBSD is the only(?) platform with getenv_r() */
96+
#if !defined(__NetBSD__)
9897
#include <errno.h>
9998
#include <stdlib.h>
10099
#include <string.h>

‎lib/librumpuser/rumpuser_sp.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: rumpuser_sp.c,v 1.61 2013/11/01 23:22:13 pooka Exp $ */
1+
/* $NetBSD: rumpuser_sp.c,v 1.62 2014/01/08 01:45:29 pooka Exp $ */
22

33
/*
44
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -37,7 +37,7 @@
3737
#include "rumpuser_port.h"
3838

3939
#if !defined(lint)
40-
__RCSID("$NetBSD: rumpuser_sp.c,v 1.61 2013/11/01 23:22:13 pooka Exp $");
40+
__RCSID("$NetBSD: rumpuser_sp.c,v 1.62 2014/01/08 01:45:29 pooka Exp $");
4141
#endif /* !lint */
4242

4343
#include <sys/types.h>
@@ -90,7 +90,7 @@ static char banner[MAXBANNER];
9090

9191

9292
/* how to use atomic ops on Linux? */
93-
#if defined(__linux__) || defined(__APPLE__) || defined(__CYGWIN__)
93+
#if defined(__linux__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__OpenBSD__)
9494
static pthread_mutex_t discomtx = PTHREAD_MUTEX_INITIALIZER;
9595

9696
static void

‎lib/librumpuser/sp_common.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: sp_common.c,v 1.37 2013/12/31 00:25:17 pooka Exp $ */
1+
/* $NetBSD: sp_common.c,v 1.38 2014/01/08 01:45:29 pooka Exp $ */
22

33
/*
44
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -36,6 +36,7 @@
3636
#include <sys/queue.h>
3737
#include <sys/socket.h>
3838
#include <sys/un.h>
39+
#include <sys/uio.h>
3940

4041
#include <arpa/inet.h>
4142
#include <netinet/in.h>

‎sys/netinet/CVS/Entries

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,5 +82,5 @@
8282
/udp.h/1.16/Fri Jun 22 14:54:35 2012//D2014.01.03.14.00.00
8383
/udp_private.h/1.3/Mon Apr 28 20:24:09 2008//D2014.01.03.14.00.00
8484
/udp_var.h/1.39/Thu Jan 2 18:29:01 2014//D2014.01.03.14.00.00
85-
/udp_usrreq.c/1.193/Sat Jan 4 14:23:50 2014//D2014.01.04.14.20.00
85+
/udp_usrreq.c/1.193/Wed Jan 8 01:54:17 2014//D2014.01.04.14.20.00
8686
D

‎tools/llvm-lib/CVS/Entries.Log

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ A D/libLLVMPowerPCTargetInfo////
4444
A D/libLLVMRuntimeDyld////
4545
A D/libLLVMScalarOpts////
4646
A D/libLLVMSelectionDAG////
47+
A D/libLLVMSparcAsmPrinter////
4748
A D/libLLVMSparcCodeGen////
4849
A D/libLLVMSparcMCTargetDesc////
4950
A D/libLLVMSparcTargetInfo////
@@ -116,5 +117,6 @@ R D/liblldReaderWriterELFMips////
116117
R D/libclangStaticAnalyzer////
117118
R D/libclangRewrite////
118119
R D/libMCLinkerScript////
120+
R D/libLLVMSparcAsmPrinter////
119121
R D/libLLVMPowerPCDisassembler////
120122
R D/libLLVMCore////

0 commit comments

Comments
 (0)