From owner-svn-src-projects@FreeBSD.ORG  Wed Jan 28 22:32:04 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B4801E5F;
 Wed, 28 Jan 2015 22:32:04 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A0B22CCD;
 Wed, 28 Jan 2015 22:32:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0SMW49Z000464;
 Wed, 28 Jan 2015 22:32:04 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0SMW4Di000463;
 Wed, 28 Jan 2015 22:32:04 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201501282232.t0SMW4Di000463@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 28 Jan 2015 22:32:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r277861 - projects/clang360-import/usr.sbin/sa
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jan 2015 22:32:04 -0000

Author: dim
Date: Wed Jan 28 22:32:03 2015
New Revision: 277861
URL: https://svnweb.freebsd.org/changeset/base/277861

Log:
  Merge ^/head r277858 through r277860.

Modified:
  projects/clang360-import/usr.sbin/sa/db.c
Directory Properties:
  projects/clang360-import/   (props changed)

Modified: projects/clang360-import/usr.sbin/sa/db.c
==============================================================================
--- projects/clang360-import/usr.sbin/sa/db.c	Wed Jan 28 22:22:49 2015	(r277860)
+++ projects/clang360-import/usr.sbin/sa/db.c	Wed Jan 28 22:32:03 2015	(r277861)
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
 #include "extern.h"
 
 /* Key used to store the version of the database data elements. */
-#define VERSION_KEY "\0VERSION"
+static char VERSION_KEY[] = "\0VERSION";
 
 /*
  * Create the in-memory database, *mdb.