Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 6 Jun 2009 07:13:57 +0000 (UTC)
From:      Robert Watson <rwatson@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r193571 - head/sys/fs/udf
Message-ID:  <200906060713.n567DvVF051740@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906060713.n567DvVF051740>