svn commit: r193571 - head/sys/fs/udf

Robert Watson rwatson at FreeBSD.org
Sat Jun 6 07:13:58 UTC 2009


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);


More information about the svn-src-all mailing list