Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 5 May 2010 20:54:16 +0000 (UTC)
From:      Gavin Atkinson <gavin@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r207675 - stable/7/sbin/sysctl
Message-ID:  <201005052054.o45KsGbO061196@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gavin
Date: Wed May  5 20:54:16 2010
New Revision: 207675
URL: http://svn.freebsd.org/changeset/base/207675

Log:
  Fix merge botch.
  
  Submitted by:	Sofian Brabez <sbrabez gmail.com>
  Pointy hat:	Earned and deserved.

Modified:
  stable/7/sbin/sysctl/sysctl.c

Modified: stable/7/sbin/sysctl/sysctl.c
==============================================================================
--- stable/7/sbin/sysctl/sysctl.c	Wed May  5 20:43:40 2010	(r207674)
+++ stable/7/sbin/sysctl/sysctl.c	Wed May  5 20:54:16 2010	(r207675)
@@ -58,7 +58,7 @@ static const char rcsid[] =
 #include <string.h>
 #include <unistd.h>
 
-static int	aflag, bflag, dflag, eflag, hflag, iflag,
+static int	aflag, bflag, dflag, eflag, hflag, iflag;
 static int	Nflag, nflag, oflag, qflag, xflag;
 
 static int	oidfmt(int *, int, char *, u_int *);



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