From owner-svn-src-head@FreeBSD.ORG  Sat Jun  6 07:13:57 2009
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D2B4F1065695;
	Sat,  6 Jun 2009 07:13:57 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C062E8FC19;
	Sat,  6 Jun 2009 07:13:57 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n567DvR1051741;
	Sat, 6 Jun 2009 07:13:57 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n567DvVF051740;
	Sat, 6 Jun 2009 07:13:57 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200906060713.n567DvVF051740@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 6 Jun 2009 07:13:57 +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: r193571 - head/sys/fs/udf
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sat, 06 Jun 2009 07:13:58 -0000

Author: rwatson
Date: Sat Jun  6 07:13:57 2009
New Revision: 193571
URL: http://svn.freebsd.org/changeset/base/193571

Log:
  Use #ifdef APPLE_MAC instead of #ifdef MAC to conditionalize Apple-specific
  behavior for unicode support in UDF so as not to conflict with the MAC
  Framework.
  
  Note that Apple's XNU kernel also uses #ifdef MAC for the MAC Framework.
  
  Suggested by:	pjd
  MFC after:	3 days

Modified:
  head/sys/fs/udf/osta.c

Modified: head/sys/fs/udf/osta.c
==============================================================================
--- head/sys/fs/udf/osta.c	Sat Jun  6 06:44:13 2009	(r193570)
+++ head/sys/fs/udf/osta.c	Sat Jun  6 07:13:57 2009	(r193571)
@@ -280,7 +280,7 @@ main()
  * Define MAXLEN = 255
  *
  * Macintosh:
- * Define MAC.
+ * Define APPLE_MAC.
  * Define MAXLEN = 31.
  *
  * UNIX
@@ -484,7 +484,7 @@ int UnicodeInString(
  */
 int IsIllegal(unicode_t ch)
 {
-#ifdef MAC
+#ifdef APPLE_MAC
 	/* Only illegal character on the MAC is the colon. */
 	if (ch == 0x003A) {
 		return(1);