From owner-p4-projects@FreeBSD.ORG  Fri Jan  4 15:15:07 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EA89D16A46D; Fri,  4 Jan 2008 15:15:06 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AFBBE16A469
	for <perforce@FreeBSD.org>; Fri,  4 Jan 2008 15:15:06 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9F63A13C47E
	for <perforce@FreeBSD.org>; Fri,  4 Jan 2008 15:15:06 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m04FF6gr005675
	for <perforce@FreeBSD.org>; Fri, 4 Jan 2008 15:15:06 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m04FF6iB005672
	for perforce@freebsd.org; Fri, 4 Jan 2008 15:15:06 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Fri, 4 Jan 2008 15:15:06 GMT
Message-Id: <200801041515.m04FF6iB005672@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 132484 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Fri, 04 Jan 2008 15:15:07 -0000

http://perforce.freebsd.org/chv.cgi?CH=132484

Change 132484 by gonzo@gonzo_jeeves on 2008/01/04 15:14:35

	o Use __ASSEMBLER__ macro to exclude C-part of setjmp.h, 
	    it's either this way or we'll have to duplicate setjmp constants
	    in asm.h

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/include/setjmp.h#4 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/include/setjmp.h#4 (text+ko) ====

@@ -47,11 +47,13 @@
  * internally to avoid some run-time errors for mismatches.
  */
 #ifndef _LOCORE
+#ifndef __ASSEMBLER__
 #if __BSD_VISIBLE || __POSIX_VISIBLE || __XSI_VISIBLE
 typedef struct _sigjmp_buf { long _sjb[_JBLEN + 1]; } sigjmp_buf[1];
 #endif
 
 typedef struct _jmp_buf { long _jb[_JBLEN + 1]; } jmp_buf[1];
-#endif
+#endif /* __ASSEMBLER__ */
+#endif /* _LOCORE */
 
 #endif /* _MACHINE_SETJMP_H_ */