diff options
| author | John Levon <john.levon@joyent.com> | 2018-10-04 14:16:36 +0000 |
|---|---|---|
| committer | John Levon <john.levon@joyent.com> | 2018-10-04 14:17:27 +0000 |
| commit | ee4c7a44cc40ef09d84ad16a742b124f3122fea2 (patch) | |
| tree | 8795f1830a80acaddb0c0198d5d21587bee6781e /usr/src/cmd | |
| parent | ccdb3132be8134de6b5411bd214acdf0f702cca3 (diff) | |
| download | illumos-joyent-ee4c7a44cc40ef09d84ad16a742b124f3122fea2.tar.gz | |
OS-7276 various illumos fixes needed for newer GCC versions
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Approved by: Jerry Jelinek <jerry.jelinek@joyent.com>
Diffstat (limited to 'usr/src/cmd')
| -rw-r--r-- | usr/src/cmd/column/Makefile | 37 | ||||
| -rw-r--r-- | usr/src/cmd/column/column.c | 8 |
2 files changed, 15 insertions, 30 deletions
diff --git a/usr/src/cmd/column/Makefile b/usr/src/cmd/column/Makefile index ab4cf3390e..b9b395b384 100644 --- a/usr/src/cmd/column/Makefile +++ b/usr/src/cmd/column/Makefile @@ -1,42 +1,33 @@ # -# CDDL HEADER START +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. # -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright (c) 2013 Joyent, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright 2018 Joyent, Inc. # PROG=column +OBJS=column.o include ../Makefile.cmd -CFLAGS += $(CCVERBOSE) - .KEEP_STATE: all: $(PROG) +$(PROG): $(OBJS) + $(LINK.c) -o $@ $(OBJS) $(LDLIBS) + $(POST_PROCESS) + install: all $(ROOTPROG) clean: + $(RM) $(OBJS) lint: lint_PROG diff --git a/usr/src/cmd/column/column.c b/usr/src/cmd/column/column.c index 4f9a3c81a6..5c76cb8751 100644 --- a/usr/src/cmd/column/column.c +++ b/usr/src/cmd/column/column.c @@ -27,15 +27,9 @@ * SUCH DAMAGE. */ /* - * Portions Copyright (c) 2013 Joyent, Inc. All rights reserved. + * Portions Copyright 2018 Joyent, Inc. */ -#ifndef lint -static const char copyright[] = -"@(#) Copyright (c) 1989, 1993, 1994\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif - #include <sys/types.h> #include <sys/ioctl.h> #include <sys/param.h> |