svn commit: r1803191 - /subversion/trunk/subversion/include/svn_delta.h

[ko...@apache.org]

Author: kotkov
Date: Thu Jul 27 14:41:25 2017
New Revision: 1803191

URL: http://svn.apache.org/viewvc?rev=1803191&view=rev
Log:
Following up r1803143, attempt to fix SWIG python bindings by not using
the forward declaration for svn_delta_editor_t.

Apparently, the parser in swig/header_wrappers.py treats such types as
opaque, and therefore incorrectly uses the %opaque_proxy when declaring
the corresponding proxy.

* subversion/include/svn_delta.h
  (svn_delta_editor_t): Remove forward declaration.
  (svn_delta_editor_t.apply_textdelta_stream): Update declaration of
   this vtable member.

Modified:
    subversion/trunk/subversion/include/svn_delta.h

Modified: subversion/trunk/subversion/include/svn_delta.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_delta.h?rev=1803191&r1=1803190&r2=1803191&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_delta.h (original)
+++ subversion/trunk/subversion/include/svn_delta.h Thu Jul 27 14:41:25 2017
@@ -690,9 +690,6 @@ svn_txdelta_skip_svndiff_window(apr_file
  * @{
  */
 
-/* Forward declarations. */
-typedef struct svn_delta_editor_t svn_delta_editor_t;
-
 /** A structure full of callback functions the delta source will invoke
  * as it produces the delta.
  *
@@ -874,7 +871,7 @@ typedef struct svn_delta_editor_t svn_de
  * dead; the only further operation which may be called on the editor
  * is @c abort_edit.
  */
-struct svn_delta_editor_t
+typedef struct svn_delta_editor_t
 {
   /** Set the target revision for this edit to @a target_revision.  This
    * call, if used, should precede all other editor calls.
@@ -1168,7 +1165,7 @@ struct svn_delta_editor_t
    * Any temporary allocations may be performed in @a scratch_pool.
    */
   svn_error_t *(*apply_textdelta_stream)(
-    const svn_delta_editor_t *editor,
+    const struct svn_delta_editor_t *editor,
     void *file_baton,
     const char *base_checksum,
     svn_txdelta_stream_open_func_t open_func,
@@ -1177,7 +1174,7 @@ struct svn_delta_editor_t
 
   /* Be sure to update svn_delta_get_cancellation_editor() and
    * svn_delta_default_editor() if you add a new callback here. */
-};
+} svn_delta_editor_t;
 
 
 /** Return a default delta editor template, allocated in @a pool.