casa-mp-base

Index: subversion/libsvn_subr/io.c

===================================================================

--- subversion/libsvn_subr/io.c (revision 1527683)

+++ subversion/libsvn_subr/io.c (working copy)

@@ -154,7 +154,7 @@

                 const char *path_apr,

                 apr_pool_t *pool)

 {

-#if defined(WIN32) || defined(DARWIN)

+#if defined(WIN32)

   *path_utf8 = path_apr;

   return SVN_NO_ERROR;

 #else

@@ -237,7 +237,7 @@

                    const char *parent,

                    apr_pool_t *pool)

 {

-#if defined(WIN32) || defined(DARWIN)

+#if defined(WIN32)

   *name_p = apr_pstrdup(pool, name);

   return SVN_NO_ERROR;

 #else

Index: subversion/libsvn_subr/path.c

===================================================================

--- subversion/libsvn_subr/path.c   (revision 1527683)

+++ subversion/libsvn_subr/path.c   (working copy)

@@ -40,6 +40,9 @@

 #include "dirent_uri.h"

+#if defined(DARWIN)

+#include <CoreFoundation/CoreFoundation.h>

+#endif /* DARWIN */

 /* The canonical empty path.  Can this be changed?  Well, change the empty

    test below and the path library will work, not so sure about the fs/wc

@@ -1100,7 +1103,7 @@

 }

 •

-#if !defined(WIN32) && !defined(DARWIN)

+#if !defined(WIN32)

 /** Get APR's internal path encoding. */

 static svn_error_t *

 get_path_encoding(svn_boolean_t *path_is_utf8, apr_pool_t *pool)

@@ -1127,7 +1130,7 @@

                            const char *path_utf8,

                            apr_pool_t *pool)

 {

-#if !defined(WIN32) && !defined(DARWIN)

+#if !defined(WIN32)

   svn_boolean_t path_is_utf8;

   SVN_ERR(get_path_encoding(&path_is_utf8, pool));

   if (path_is_utf8)

@@ -1136,7 +1139,7 @@

       *path_apr = apr_pstrdup(pool, path_utf8);

       return SVN_NO_ERROR;

     }

-#if !defined(WIN32) && !defined(DARWIN)

+#if !defined(WIN32)

   else

     return svn_utf_cstring_from_utf8(path_apr, path_utf8, pool);

 #endif