From owner-p4-projects@FreeBSD.ORG  Mon Jun  3 19:11:39 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id EF5FA1CB; Mon,  3 Jun 2013 19:11:38 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id AEBE51C9
 for <perforce@freebsd.org>; Mon,  3 Jun 2013 19:11:38 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9FA6810BB
 for <perforce@freebsd.org>; Mon,  3 Jun 2013 19:11:38 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r53JBcgZ066796
 for <perforce@freebsd.org>; Mon, 3 Jun 2013 19:11:38 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r53JBcCf066793
 for perforce@freebsd.org; Mon, 3 Jun 2013 19:11:38 GMT
 (envelope-from brooks@freebsd.org)
Date: Mon, 3 Jun 2013 19:11:38 GMT
Message-Id: <201306031911.r53JBcCf066793@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 229326 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Jun 2013 19:11:39 -0000

http://p4web.freebsd.org/@@229326?ac=10

Change 229326 by brooks@brooks_zenith on 2013/06/03 19:10:51

	Manual merge of 00bd892 to allow the tree to build with
	llvm-devl-3.4.r182968.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/lib/libtesla/tesla_store.c#2 edit

Differences ...

==== //depot/projects/ctsrd/tesla/src/lib/libtesla/tesla_store.c#2 (text+ko) ====

@@ -43,7 +43,7 @@
 void		tesla_pthread_destructor(void*);
 #endif
 
-struct tesla_store global_store = { .length = 0 };
+static struct tesla_store global_store = { .length = 0 };
 
 static void	tesla_class_acquire(tesla_class*);