From 308b60f66831aa65a459a7b347ea6ca14b6e4799 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 18 Mar 1999 09:21:42 +0000 Subject: Import cvs-1.10 onto vendor branch. Merge to follow shortly. Obtained from: cyclic.com --- contrib/cvs/diff/diff.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'contrib/cvs/diff/diff.h') diff --git a/contrib/cvs/diff/diff.h b/contrib/cvs/diff/diff.h index fba26a7..6107e62 100644 --- a/contrib/cvs/diff/diff.h +++ b/contrib/cvs/diff/diff.h @@ -1,5 +1,5 @@ /* Shared definitions for GNU DIFF - Copyright (C) 1988, 89, 91, 92, 93, 97 Free Software Foundation, Inc. + Copyright (C) 1988, 89, 91, 92, 93, 97, 1998 Free Software Foundation, Inc. This file is part of GNU DIFF. @@ -21,6 +21,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #include #include #include "regex.h" +#include "diffrun.h" #define TAB_WIDTH 8 @@ -32,6 +33,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #define EXTERN #endif +/* The callbacks to use for output. */ +EXTERN const struct diff_callbacks *callbacks; + enum output_style { /* Default output style. */ OUTPUT_NORMAL, @@ -329,6 +333,13 @@ void debug_script PARAMS((struct change *)); void diff_error PARAMS((char const *, char const *, char const *)); void fatal PARAMS((char const *)); void finish_output PARAMS((void)); +void write_output PARAMS((char const *, size_t)); +void printf_output PARAMS((char const *, ...)) +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 6) + __attribute__ ((__format__ (__printf__, 1, 2))) +#endif + ; +void flush_output PARAMS((void)); void message PARAMS((char const *, char const *, char const *)); void message5 PARAMS((char const *, char const *, char const *, char const *, char const *)); void output_1_line PARAMS((char const *, char const *, char const *, char const *)); -- cgit v1.1