From owner-svn-src-all@FreeBSD.ORG  Mon Jul 12 15:32:46 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 867D7106566B;
	Mon, 12 Jul 2010 15:32:46 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0A9E28FC0A;
	Mon, 12 Jul 2010 15:32:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6CFWjAs037096;
	Mon, 12 Jul 2010 15:32:45 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6CFWjPS037093;
	Mon, 12 Jul 2010 15:32:45 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201007121532.o6CFWjPS037093@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 12 Jul 2010 15:32:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209949 - in head: lib/libstand sys/kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jul 2010 15:32:46 -0000

Author: jkim
Date: Mon Jul 12 15:32:45 2010
New Revision: 209949
URL: http://svn.freebsd.org/changeset/base/209949

Log:
  Use type-specific inline function imax() instead of deprecated macro MAX().
  
  Prodded by:	bde

Modified:
  head/lib/libstand/printf.c
  head/sys/kern/subr_prf.c

Modified: head/lib/libstand/printf.c
==============================================================================
--- head/lib/libstand/printf.c	Mon Jul 12 14:27:49 2010	(r209948)
+++ head/lib/libstand/printf.c	Mon Jul 12 15:32:45 2010	(r209949)
@@ -151,7 +151,6 @@ ksprintn(char *nbuf, uintmax_t num, int 
 static int
 kvprintf(char const *fmt, void (*func)(int), void *arg, int radix, va_list ap)
 {
-#define	MAX(a, b) (((a) > (b)) ? (a) : (b))
 #define PCHAR(c) {int cc=(c); if (func) (*func)(cc); else *d++ = cc; retval++; }
 	char nbuf[MAXNBUF];
 	char *d;
@@ -422,7 +421,7 @@ number:
 
 			if (!ladjust && padc == '0')
 				dwidth = width - tmp;
-			width -= tmp + MAX(dwidth, n);
+			width -= tmp + imax(dwidth, n);
 			dwidth -= n;
 			if (!ladjust)
 				while (width-- > 0)

Modified: head/sys/kern/subr_prf.c
==============================================================================
--- head/sys/kern/subr_prf.c	Mon Jul 12 14:27:49 2010	(r209948)
+++ head/sys/kern/subr_prf.c	Mon Jul 12 15:32:45 2010	(r209949)
@@ -813,7 +813,7 @@ number:
 
 			if (!ladjust && padc == '0')
 				dwidth = width - tmp;
-			width -= tmp + MAX(dwidth, n);
+			width -= tmp + imax(dwidth, n);
 			dwidth -= n;
 			if (!ladjust)
 				while (width-- > 0)