Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3BCBF1032D for ; Tue, 29 Apr 2014 16:28:23 +0000 (UTC) Received: (qmail 63613 invoked by uid 500); 29 Apr 2014 16:28:15 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 63566 invoked by uid 500); 29 Apr 2014 16:28:15 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 63553 invoked by uid 99); 29 Apr 2014 16:28:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Apr 2014 16:28:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Apr 2014 16:28:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B0A4F2388860; Tue, 29 Apr 2014 16:27:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1591018 - /subversion/trunk/subversion/libsvn_fs_fs/cached_data.c Date: Tue, 29 Apr 2014 16:27:53 -0000 To: commits@subversion.apache.org From: stefan2@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140429162753.B0A4F2388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stefan2 Date: Tue Apr 29 16:27:53 2014 New Revision: 1591018 URL: http://svn.apache.org/r1591018 Log: Follow-up to r1591005: Fix the windows build. * subversion/libsvn_fs_fs/cached_data.c (get_fulltext_partial): We can't do pointer arithmetics with void*. Modified: subversion/trunk/subversion/libsvn_fs_fs/cached_data.c Modified: subversion/trunk/subversion/libsvn_fs_fs/cached_data.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/cached_data.c?rev=1591018&r1=1591017&r2=1591018&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_fs_fs/cached_data.c (original) +++ subversion/trunk/subversion/libsvn_fs_fs/cached_data.c Tue Apr 29 16:27:53 2014 @@ -1762,7 +1762,8 @@ get_fulltext_partial(void **out, fulltext_baton->read = MIN(fulltext_len - start, fulltext_baton->len); /* Copy the data to the output buffer and be done. */ - memcpy(fulltext_baton->buffer, data + start, fulltext_baton->read); + memcpy(fulltext_baton->buffer, (const char *)data + start, + fulltext_baton->read); return SVN_NO_ERROR; }