CVS commit: [netbsd-5] src/sys/sys
Module Name:src
Committed By: bouyer
Date: Wed Aug 22 20:21:27 UTC 2012
Modified Files:
src/sys/sys [netbsd-5]: sysctl.h
Log Message:
Apply patch, requested by dsl in ticket 1769:
sys/sys/sysctl.hpatch
define CTLTYPE_LONG, needed for ticket 1770
To generate a diff of this commit:
cvs rdiff -u -r1.177.4.1 -r1.177.4.2 src/sys/sys/sysctl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/sysctl.h
diff -u src/sys/sys/sysctl.h:1.177.4.1 src/sys/sys/sysctl.h:1.177.4.2
--- src/sys/sys/sysctl.h:1.177.4.1 Wed Apr 1 00:25:22 2009
+++ src/sys/sys/sysctl.h Wed Aug 22 20:21:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctl.h,v 1.177.4.1 2009/04/01 00:25:22 snj Exp $ */
+/* $NetBSD: sysctl.h,v 1.177.4.2 2012/08/22 20:21:26 bouyer Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -88,6 +88,12 @@ struct ctlname {
#define CTLTYPE_STRUCT 5 /* name describes a structure */
#define CTLTYPE_BOOL 6 /* name describes a bool */
+#ifdef _LP64
+#define CTLTYPE_LONG CTLTYPE_QUAD
+#else
+#define CTLTYPE_LONG CTLTYPE_INT
+#endif
+
/*
* Flags that apply to each node, governing access and other features
*/
CVS commit: [netbsd-5] src/sys/sys
Module Name:src Committed By: bouyer Date: Fri May 20 19:26:01 UTC 2011 Modified Files: src/sys/sys [netbsd-5]: bitops.h Log Message: Pull up following revision(s) (requested by jym in ticket #1616): sys/sys/bitops.h: revision 1.8 Use fls64() only for types strictly bigger than 4 bytes. ok christos@. Will ask for a pull-up, using 64 bits ops even for 4-bytes int's is plain overkill. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.10.1 src/sys/sys/bitops.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/bitops.h diff -u src/sys/sys/bitops.h:1.2 src/sys/sys/bitops.h:1.2.10.1 --- src/sys/sys/bitops.h:1.2 Mon Apr 28 20:24:10 2008 +++ src/sys/sys/bitops.h Fri May 20 19:26:01 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bitops.h,v 1.2 2008/04/28 20:24:10 martin Exp $ */ +/* $NetBSD: bitops.h,v 1.2.10.1 2011/05/20 19:26:01 bouyer Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -253,7 +253,7 @@ _ilog2_helper(_n, 2) \ _ilog2_helper(_n, 1) \ _ilog2_helper(_n, 0) \ - -1) : ((sizeof(_n) >= 4 ? fls64(_n) : fls32(_n)) - 1) \ + -1) : ((sizeof(_n) > 4 ? fls64(_n) : fls32(_n)) - 1) \ ) #endif /* _SYS_BITOPS_H_ */
CVS commit: [netbsd-5] src/sys/sys
Module Name:src Committed By: snj Date: Sun Mar 21 03:45:33 UTC 2010 Modified Files: src/sys/sys [netbsd-5]: null.h Log Message: Pull up following revision(s) (requested by joerg in ticket #1344): sys/sys/null.h: revision 1.8 Enclose (void *)0 in an extra set of parenthese to make the result usable in arbitrary expressions. Fixes PR/41890, I can't think of any downsides! To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.86.1 src/sys/sys/null.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/null.h diff -u src/sys/sys/null.h:1.7 src/sys/sys/null.h:1.7.86.1 --- src/sys/sys/null.h:1.7 Sat Dec 3 17:10:46 2005 +++ src/sys/sys/null.h Sun Mar 21 03:45:33 2010 @@ -1,11 +1,11 @@ -/* $NetBSD: null.h,v 1.7 2005/12/03 17:10:46 christos Exp $ */ +/* $NetBSD: null.h,v 1.7.86.1 2010/03/21 03:45:33 snj Exp $ */ #ifndef _SYS_NULL_H_ #define _SYS_NULL_H_ #ifndef NULL #if !defined(__GNUG__) || __GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 90) #if !defined(__cplusplus) -#define NULL (void *)0 +#define NULL ((void *)0) #else #define NULL 0 #endif /* !__cplusplus */
CVS commit: [netbsd-5] src/sys/sys
Module Name:src Committed By: bouyer Date: Sun Feb 14 13:30:04 UTC 2010 Modified Files: src/sys/sys [netbsd-5]: namei.h Log Message: Regen for ticket 1289 To generate a diff of this commit: cvs rdiff -u -r1.60.14.2 -r1.60.14.3 src/sys/sys/namei.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/namei.h diff -u src/sys/sys/namei.h:1.60.14.2 src/sys/sys/namei.h:1.60.14.3 --- src/sys/sys/namei.h:1.60.14.2 Wed Dec 10 21:28:50 2008 +++ src/sys/sys/namei.h Sun Feb 14 13:30:04 2010 @@ -1,10 +1,10 @@ -/* $NetBSD: namei.h,v 1.60.14.2 2008/12/10 21:28:50 snj Exp $ */ +/* $NetBSD: namei.h,v 1.60.14.3 2010/02/14 13:30:04 bouyer Exp $ */ /* * WARNING: GENERATED FILE. DO NOT EDIT * (edit namei.src and run make namei) * by: NetBSD: gennameih.awk,v 1.2 2008/04/30 13:11:00 martin Exp - * from: NetBSD: namei.src,v 1.8.14.1 2008/12/10 21:26:56 snj Exp + * from: NetBSD: namei.src,v 1.8.14.2 2010/02/14 13:27:45 bouyer Exp */ /* @@ -143,7 +143,8 @@ #define DOWHITEOUT 0x004 /* do whiteouts */ #define REQUIREDIR 0x008 /* must be a directory */ #define CREATEDIR 0x020 /* trailing slashes are ok */ -#define PARAMASK 0x02fff00 /* mask of parameter descriptors */ +#define INRENAME 0x040 /* operation is a part of ``rename'' */ +#define PARAMASK 0x06fff00 /* mask of parameter descriptors */ /* * Initialization of an nameidata structure. @@ -271,6 +272,7 @@ #define NAMEI_DOWHITEOUT 0x004 #define NAMEI_REQUIREDIR 0x008 #define NAMEI_CREATEDIR 0x020 -#define NAMEI_PARAMASK 0x02fff00 +#define NAMEI_INRENAME 0x040 +#define NAMEI_PARAMASK 0x06fff00 #endif /* !_SYS_NAMEI_H_ */
CVS commit: [netbsd-5] src/sys/sys
Module Name:src Committed By: snj Date: Fri Dec 18 06:12:51 UTC 2009 Modified Files: src/sys/sys [netbsd-5]: stat.h Log Message: Pull up following revision(s) (requested by dholland in ticket #1196): sys/sys/stat.h: revision 1.59 Parenthesize S_IS*() macro arguments to prevent breakage with certain arguments - see PR 41919. Approved by dholland. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.57.4.1 src/sys/sys/stat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/stat.h diff -u src/sys/sys/stat.h:1.57 src/sys/sys/stat.h:1.57.4.1 --- src/sys/sys/stat.h:1.57 Thu Jul 31 05:38:06 2008 +++ src/sys/sys/stat.h Fri Dec 18 06:12:51 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: stat.h,v 1.57 2008/07/31 05:38:06 simonb Exp $ */ +/* $NetBSD: stat.h,v 1.57.4.1 2009/12/18 06:12:51 snj Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -168,21 +168,21 @@ #define S_ARCH2 _S_ARCH2 #endif -#define S_ISDIR(m) ((m & _S_IFMT) == _S_IFDIR) /* directory */ -#define S_ISCHR(m) ((m & _S_IFMT) == _S_IFCHR) /* char special */ -#define S_ISBLK(m) ((m & _S_IFMT) == _S_IFBLK) /* block special */ -#define S_ISREG(m) ((m & _S_IFMT) == _S_IFREG) /* regular file */ -#define S_ISFIFO(m) ((m & _S_IFMT) == _S_IFIFO) /* fifo */ +#define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR) /* directory */ +#define S_ISCHR(m) (((m) & _S_IFMT) == _S_IFCHR) /* char special */ +#define S_ISBLK(m) (((m) & _S_IFMT) == _S_IFBLK) /* block special */ +#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG) /* regular file */ +#define S_ISFIFO(m) (((m) & _S_IFMT) == _S_IFIFO) /* fifo */ #if ((_POSIX_C_SOURCE - 0) >= 200112L) || defined(_XOPEN_SOURCE) || \ defined(_NETBSD_SOURCE) -#define S_ISLNK(m) ((m & _S_IFMT) == _S_IFLNK) /* symbolic link */ +#define S_ISLNK(m) (((m) & _S_IFMT) == _S_IFLNK) /* symbolic link */ #endif #if ((_POSIX_C_SOURCE - 0) >= 200112L) || ((_XOPEN_SOURCE - 0) >= 600) || \ defined(_NETBSD_SOURCE) -#define S_ISSOCK(m) ((m & _S_IFMT) == _S_IFSOCK) /* socket */ +#define S_ISSOCK(m) (((m) & _S_IFMT) == _S_IFSOCK) /* socket */ #endif #if defined(_NETBSD_SOURCE) -#define S_ISWHT(m) ((m & _S_IFMT) == _S_IFWHT) /* whiteout */ +#define S_ISWHT(m) (((m) & _S_IFMT) == _S_IFWHT) /* whiteout */ #endif #if defined(_NETBSD_SOURCE)
CVS commit: [netbsd-5] src/sys/sys
Module Name:src Committed By: snj Date: Tue Apr 7 23:25:09 UTC 2009 Modified Files: src/sys/sys [netbsd-5]: timex.h Log Message: Pull up following revision(s) (requested by mhitch in ticket #671): sys/sys/timex.h: revision 1.18 PR#41144: ntpd dies when syncing, use octal format to avoid \xcCLOCK to be parsed as \xcc To generate a diff of this commit: cvs rdiff -u -r1.14.12.2 -r1.14.12.3 src/sys/sys/timex.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/timex.h diff -u src/sys/sys/timex.h:1.14.12.2 src/sys/sys/timex.h:1.14.12.3 --- src/sys/sys/timex.h:1.14.12.2 Fri Jan 16 03:04:45 2009 +++ src/sys/sys/timex.h Tue Apr 7 23:25:09 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: timex.h,v 1.14.12.2 2009/01/16 03:04:45 snj Exp $ */ +/* $NetBSD: timex.h,v 1.14.12.3 2009/04/07 23:25:09 snj Exp $ */ /*- *** @@ -167,14 +167,14 @@ b\5DEL\0\ b\6UNSYNC\0\ b\7FREQHOLD\0\ -b\x8PPSSIGNAL\0\ -b\x9PPSJITTER\0\ -b\xaPPSWANDER\0\ -b\xbPPSERROR\0\ -b\xcCLOCKERR\0\ -b\xdNANO\0\ -f\xe\1MODE\0=\0PLL\0=\1FLL\0\ -f\xf\1CLK\0=\0A\0=\1B\0" +b\10PPSSIGNAL\0\ +b\11PPSJITTER\0\ +b\12PPSWANDER\0\ +b\13PPSERROR\0\ +b\14CLOCKERR\0\ +b\15NANO\0\ +f\16\1MODE\0=\0PLL\0=\1FLL\0\ +f\17\1CLK\0=\0A\0=\1B\0" #define STA_RONLY (STA_PPSSIGNAL | STA_PPSJITTER | STA_PPSWANDER | \ STA_PPSERROR | STA_CLOCKERR | STA_NANO | STA_MODE | STA_CLK)
CVS commit: [netbsd-5] src/sys/sys
Module Name:src Committed By: snj Date: Wed Apr 1 22:30:55 UTC 2009 Modified Files: src/sys/sys [netbsd-5]: siginfo.h Log Message: Pull up following revision(s) (requested by rmind in ticket #631): sys/sys/siginfo.h: revision 1.18 fix typo for POLL_HUP. Noted by yamt. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.17.10.1 src/sys/sys/siginfo.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/siginfo.h diff -u src/sys/sys/siginfo.h:1.17 src/sys/sys/siginfo.h:1.17.10.1 --- src/sys/sys/siginfo.h:1.17 Mon Apr 28 20:24:11 2008 +++ src/sys/sys/siginfo.h Wed Apr 1 22:30:55 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: siginfo.h,v 1.17 2008/04/28 20:24:11 martin Exp $ */ +/* $NetBSD: siginfo.h,v 1.17.10.1 2009/04/01 22:30:55 snj Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -220,7 +220,7 @@ #define POLL_MSG 3 /* Input message available */ #define POLL_ERR 4 /* I/O Error*/ #define POLL_PRI 5 /* High priority input available */ -#define POLL_HUP 4 /* Device disconnected */ +#define POLL_HUP 6 /* Device disconnected */ /** si_code */
