From 7877420012f3fdc8feaa976ab4a71dc8ef6a923b Mon Sep 17 00:00:00 2001 From: Alex Clemmer Date: Thu, 2 Jun 2011 03:55:55 -0400 Subject: [PATCH] Put structs meant for export in the proper file --- src/libdiff/include.h | 21 --------------------- src/libdiff/libdiff.h | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/libdiff/include.h b/src/libdiff/include.h index d796caa10f3..0754045f712 100644 --- a/src/libdiff/include.h +++ b/src/libdiff/include.h @@ -21,27 +21,6 @@ #define max(a, b) ( ((a) > (b)) ? (a) : (b) ) #endif -#define END_OF_SCRIPT 0 -#define INSERTION 1 -#define DELETION 2 - - - -struct edit { - struct record *rcrd; - struct edit *next; - unsigned char edit; - size_t x; - size_t y; - size_t k; -}; - - -struct record { - unsigned long start; - unsigned long end; - unsigned long hash; -}; struct diff_env { diff --git a/src/libdiff/libdiff.h b/src/libdiff/libdiff.h index 87826d391b0..0c4d7d33001 100644 --- a/src/libdiff/libdiff.h +++ b/src/libdiff/libdiff.h @@ -9,6 +9,10 @@ #include "../common.h" +#define END_OF_SCRIPT 0 +#define INSERTION 1 +#define DELETION 2 + struct diff_mem { @@ -17,6 +21,23 @@ struct diff_mem { }; +struct edit { + struct record *rcrd; + struct edit *next; + unsigned char edit; + size_t x; + size_t y; + size_t k; +}; + + +struct record { + unsigned long start; + unsigned long end; + unsigned long hash; +}; + + int diff(struct diff_mem *diffme1, struct diff_mem *diffme2);