From dde155e95a094248663c33fb3ab827a31ce00cbc Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Sat, 6 Jun 2009 07:13:57 +0000 Subject: [PATCH] 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 --- sys/fs/udf/osta.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/udf/osta.c b/sys/fs/udf/osta.c index 81c72862d45..70a22d93365 100644 --- a/sys/fs/udf/osta.c +++ b/sys/fs/udf/osta.c @@ -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);