From owner-svn-src-head@FreeBSD.ORG  Mon Apr  1 13:48:31 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 3DDCF302;
 Mon,  1 Apr 2013 13:48:31 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 30363721;
 Mon,  1 Apr 2013 13:48:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r31DmVj2082508;
 Mon, 1 Apr 2013 13:48:31 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r31DmVnW082507;
 Mon, 1 Apr 2013 13:48:31 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201304011348.r31DmVnW082507@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Mon, 1 Apr 2013 13:48:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248975 - head/crypto/openssh
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Apr 2013 13:48:31 -0000

Author: des
Date: Mon Apr  1 13:48:30 2013
New Revision: 248975
URL: http://svnweb.freebsd.org/changeset/base/248975

Log:
  Silence warnings about redefined macros.

Modified:
  head/crypto/openssh/umac128.c

Modified: head/crypto/openssh/umac128.c
==============================================================================
--- head/crypto/openssh/umac128.c	Mon Apr  1 13:27:49 2013	(r248974)
+++ head/crypto/openssh/umac128.c	Mon Apr  1 13:48:30 2013	(r248975)
@@ -1,7 +1,11 @@
 /* $FreeBSD$ */
 #define UMAC_OUTPUT_LEN		16
+#undef umac_new
 #define umac_new		ssh_umac128_new
+#undef umac_update
 #define umac_update		ssh_umac128_update
+#undef umac_final
 #define umac_final		ssh_umac128_final
+#undef umac_delete
 #define umac_delete		ssh_umac128_delete
 #include "umac.c"