HEADS UP: merged llvm/clang 3.4

[David Wolfskill]

On Sat, Mar 22, 2014 at 09:26:10PM +0100, Dimitry Andric wrote:
> ...
> > In file included from /usr/src/usr.bin/vi/../../contrib/nvi/vi/../common/common.h:76:
> > /usr/src/usr.bin/vi/../../contrib/nvi/vi/../common/key.h:129:2: error: invalid preprocessing directive
> > #do2
> > ^
> 
> I would check your hardware (e.g. RAM and harddrives) for errors, since
> line 129 in contrib/nvi/common/key.h should be:
> 
> #define e_tlno  _u_event._e_mark.lno2
> 
> E.g. it looks like your source checkout is corrupted.  In my working
> copy of stable/10, key.h has the following SHA1, can you check yours
> against that?
> 
> SHA1 (key.h) = 5dbad7259221ea1555455090031d1c33f1e7b55f
> ....

I'm certainly open to the possibility of hardware issues... but here's
what I see:

g1-252(9.2-S)[2] cd /S3/usr/src
g1-252(9.2-S)[3] svn stat contrib/nvi/common/key.h
g1-252(9.2-S)[4] svn stat -v contrib/nvi/common/key.h
            263620   254225 peter        contrib/nvi/common/key.h
g1-252(9.2-S)[5] sha1 !$
sha1 contrib/nvi/common/key.h
SHA1 (contrib/nvi/common/key.h) = 5dbad7259221ea1555455090031d1c33f1e7b55f
g1-252(9.2-S)[6] svn info
Path: .
Working Copy Root Path: /S3/usr/src
URL: file:///svn/freebsd/src/base/stable/10
Relative URL: ^/stable/10
Repository Root: file:///svn/freebsd/src/base
Repository UUID: ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Revision: 263620
Node Kind: directory
Schedule: normal
Last Changed Author: edavis
Last Changed Rev: 263581
Last Changed Date: 2014-03-21 16:04:23 -0700 (Fri, 21 Mar 2014)

g1-252(9.2-S)[7] 



Hmm.....

Peace,
david
-- 
David H. Wolfskill				david at catwhisker.org
Taliban: Evil cowards with guns afraid of truth from a 14-year old girl.

See http://www.catwhisker.org/~david/publickey.gpg for my public key.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 964 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-stable/attachments/20140322/efc0165f/attachment.sig>