diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2018-06-10 02:34:41 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2018-06-10 02:34:41 +0000 |
| commit | 6387091e9ad676a28206aed59ee953e27876aa51 (patch) | |
| tree | c0d8eb906bcb1a84431d34b966affc328dd42bf4 /lib/libcompat | |
| parent | a96081bb87d0d1857388aaad7294268cc64a9a94 (diff) | |
| download | src-test-6387091e9ad676a28206aed59ee953e27876aa51.tar.gz src-test-6387091e9ad676a28206aed59ee953e27876aa51.zip | |
Use __SCSSID() for SCCS IDs.
While here, fix $FreeBSD$ ID in ftime.c to use __FBSDID instead of a static
array.
Notes
Notes:
svn path=/head/; revision=334911
Diffstat (limited to 'lib/libcompat')
| -rw-r--r-- | lib/libcompat/4.1/ftime.c | 5 | ||||
| -rw-r--r-- | lib/libcompat/4.3/re_comp.c | 5 | ||||
| -rw-r--r-- | lib/libcompat/4.3/rexec.c | 8 | ||||
| -rw-r--r-- | lib/libcompat/4.4/cuserid.c | 4 | ||||
| -rw-r--r-- | lib/libcompat/Makefile | 2 |
5 files changed, 8 insertions, 16 deletions
diff --git a/lib/libcompat/4.1/ftime.c b/lib/libcompat/4.1/ftime.c index f73f46bd00061..87860df00abd6 100644 --- a/lib/libcompat/4.1/ftime.c +++ b/lib/libcompat/4.1/ftime.c @@ -30,9 +30,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef lint -static char rcsid[] = "$FreeBSD$"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/time.h> diff --git a/lib/libcompat/4.3/re_comp.c b/lib/libcompat/4.3/re_comp.c index fbfa19bac0b54..93fbc3c603a49 100644 --- a/lib/libcompat/4.3/re_comp.c +++ b/lib/libcompat/4.3/re_comp.c @@ -34,6 +34,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +__SCCSID("@(#)regex.c 5.1 (Berkeley) 3/29/92"); /* * Compatibility routines that implement the old re_comp/re_exec interface in @@ -42,10 +43,6 @@ __FBSDID("$FreeBSD$"); * but most programs should be fine. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)regex.c 5.1 (Berkeley) 3/29/92"; -#endif /* LIBC_SCCS and not lint */ - #include <regex.h> #include <stddef.h> #include <unistd.h> diff --git a/lib/libcompat/4.3/rexec.c b/lib/libcompat/4.3/rexec.c index edbe6fcc5f882..5a96903966219 100644 --- a/lib/libcompat/4.3/rexec.c +++ b/lib/libcompat/4.3/rexec.c @@ -27,13 +27,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)rexec.c 8.1 (Berkeley) 6/4/93"; -#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); +__SCCSID("@(#)rexec.c 8.1 (Berkeley) 6/4/93"); #include <sys/types.h> #include <sys/uio.h> diff --git a/lib/libcompat/4.4/cuserid.c b/lib/libcompat/4.4/cuserid.c index 325b763b8accd..0b993136f5cc2 100644 --- a/lib/libcompat/4.4/cuserid.c +++ b/lib/libcompat/4.4/cuserid.c @@ -29,11 +29,9 @@ * SUCH DAMAGE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)cuserid.c 8.1 (Berkeley) 6/4/93"; -#endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +__SCCSID("@(#)cuserid.c 8.1 (Berkeley) 6/4/93"); #include <pwd.h> #include <stdio.h> diff --git a/lib/libcompat/Makefile b/lib/libcompat/Makefile index 4961b10af9ac9..80f75c8dcae00 100644 --- a/lib/libcompat/Makefile +++ b/lib/libcompat/Makefile @@ -3,7 +3,7 @@ PACKAGE=lib${LIB} LIB= compat -CFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS -I${SRCTOP}/lib/libc/locale +CFLAGS+=-I${SRCTOP}/lib/libc/locale NO_PIC= WARNS?= 0 |