src/TortoiseMerge/libsvn_diff/deprecated.c

   1 /*
   2  * deprecated.c:  holding file for all deprecated APIs.
   3  *                "we can't lose 'em, but we can shun 'em!"
   4  *
   5  * ====================================================================
   6  * Copyright (c) 2000-2008 CollabNet.  All rights reserved.
   7  *
   8  * This software is licensed as described in the file COPYING, which
   9  * you should have received as part of this distribution.  The terms
  10  * are also available at http://subversion.tigris.org/license-1.html.
  11  * If newer versions of this license are posted there, you may use a
  12  * newer version instead, at your option.
  13  *
  14  * This software consists of voluntary contributions made by many
  15  * individuals.  For exact contribution history, see the revision
  16  * history and logs, available at http://subversion.tigris.org/.
  17  * ====================================================================
  18  */
  19
  20 /* ==================================================================== */
  21
  22
  23 \f
  24 /*** Includes. ***/
  25
  26 /* We define this here to remove any further warnings about the usage of
  27    deprecated functions in this file. */
  28 #define SVN_DEPRECATED
  29
  30 #include "svn_error.h"
  31 #include "svn_version.h"
  32 #include "svn_io.h"
  33
  34 #include "svn_diff.h"
  35 #include "svn_utf.h"
  36
  37 #include "svn_private_config.h"
  38
  39
  40
  41 \f
  42 /*** Code. ***/
  43
  44 /*** From diff_file.c ***/
  45 svn_error_t *
  46 svn_diff_file_output_unified2(svn_stream_t *output_stream,
  47                               svn_diff_t *diff,
  48                               const char *original_path,
  49                               const char *modified_path,
  50                               const char *original_header,
  51                               const char *modified_header,
  52                               const char *header_encoding,
  53                               apr_pool_t *pool)
  54 {
  55   return svn_diff_file_output_unified3(output_stream, diff,
  56                                        original_path, modified_path,
  57                                        original_header, modified_header,
  58                                        header_encoding, NULL, FALSE, pool);
  59 }
  60
  61 svn_error_t *
  62 svn_diff_file_output_unified(svn_stream_t *output_stream,
  63                              svn_diff_t *diff,
  64                              const char *original_path,
  65                              const char *modified_path,
  66                              const char *original_header,
  67                              const char *modified_header,
  68                              apr_pool_t *pool)
  69 {
  70   return svn_diff_file_output_unified2(output_stream, diff,
  71                                        original_path, modified_path,
  72                                        original_header, modified_header,
  73                                        SVN_APR_LOCALE_CHARSET, pool);
  74 }