Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 17 Mar 2018 18:55:46 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r331107 - stable/11/sys/net
Message-ID:  <201803171855.w2HItkpb010298@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dim
Date: Sat Mar 17 18:55:46 2018
New Revision: 331107
URL: https://svnweb.freebsd.org/changeset/base/331107

Log:
  Repair obvious mismerge in r330897, resulting in misleading gcc error
  messages like "sys/net/if_fddisubr.c:1: error: expected '=', ',', ';',
  'asm' or '__attribute__' before '-' token".

Modified:
  stable/11/sys/net/if_fddisubr.c

Modified: stable/11/sys/net/if_fddisubr.c
==============================================================================
--- stable/11/sys/net/if_fddisubr.c	Sat Mar 17 18:14:49 2018	(r331106)
+++ stable/11/sys/net/if_fddisubr.c	Sat Mar 17 18:55:46 2018	(r331107)
@@ -1,6 +1,6 @@
+/*-
  * SPDX-License-Identifier: BSD-4-Clause
  *
-/*-
  * Copyright (c) 1995, 1996
  *	Matt Thomas <matt@3am-software.com>.  All rights reserved.
  * Copyright (c) 1982, 1989, 1993



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803171855.w2HItkpb010298>