]> CyberLeo.Net >> Repos - FreeBSD/stable/10.git/commit
Merge r263232 from head to stable/10:
authorrwatson <rwatson@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Wed, 18 Mar 2015 15:20:08 +0000 (15:20 +0000)
committerrwatson <rwatson@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Wed, 18 Mar 2015 15:20:08 +0000 (15:20 +0000)
commit9c4d024d6091c0329d332a53f4f4effb1f8c91d5
tree269d988d287740b9ac3acf7ba6bc8bab46a50fd5
parenta3bec2713c19af529ca693dcbfd880cf875666c4
Merge r263232 from head to stable/10:

  Rename capability.h to capsicum.h: the original name conflicts with the
  draft POSIX.1e capability.h used on some systems (e.g., Linux).  On
  FreeBSD, leave a wrapper header so that current code continues to compile.

  We will eventually want to deprecate the old header as the presence of a
  capability.h may be confusing some configure scripts.

  Suggested by:   David Drysdale <drysdale at google.com>
  Discussed on:   cl-capsicum-discuss
  MFC after:      3 weeks

Sponsored by: Google, Inc.

git-svn-id: svn://svn.freebsd.org/base/stable/10@280224 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
sys/sys/capability.h
sys/sys/capsicum.h [new file with mode: 0644]