svn commit: r1534978 - /subversion/trunk/subversion/libsvn_subr/io.c

[rh...@apache.org]

Author: rhuijben
Date: Wed Oct 23 10:41:00 2013
New Revision: 1534978

URL: http://svn.apache.org/r1534978
Log:
Following up on r1534976, use WCHAR where we used apr_wchar_t from a private
apr header before.

* subversion/libsvn_subr/io.c
  (GETFINALPATHNAMEBYHANDLE): Update argument type.
  (io_unicode_to_utf8_path): Update argument type.
  (io_win_read_link): Update variable type.

Modified:
    subversion/trunk/subversion/libsvn_subr/io.c

Modified: subversion/trunk/subversion/libsvn_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/io.c?rev=1534978&r1=1534977&r2=1534978&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/io.c (original)
+++ subversion/trunk/subversion/libsvn_subr/io.c Wed Oct 23 10:41:00 2013
@@ -147,7 +147,7 @@ static volatile svn_atomic_t win_dynamic
 /* Pointer to GetFinalPathNameByHandleW function from kernel32.dll. */
 typedef DWORD (WINAPI *GETFINALPATHNAMEBYHANDLE)(
                HANDLE hFile,
-               apr_wchar_t *lpszFilePath,
+               WCHAR *lpszFilePath,
                DWORD cchFilePath,
                DWORD dwFlags);
 
@@ -1751,7 +1751,7 @@ io_utf8_to_unicode_path(const WCHAR **re
    function, but reimplemented here because APR does not export it. */
 static svn_error_t *
 io_unicode_to_utf8_path(const char **result,
-                        const apr_wchar_t *source,
+                        const WCHAR *source,
                         apr_pool_t *result_pool)
 {
     const char *utf8_buffer;
@@ -1848,7 +1848,7 @@ static svn_error_t * io_win_read_link(sv
         apr_status_t status;
         apr_file_t *file;
         apr_os_file_t filehand;
-        apr_wchar_t wdest[APR_PATH_MAX];
+        WCHAR wdest[APR_PATH_MAX];
         const char *data;
 
         /* reserve one char for terminating zero. */