From 164d300c2d4d88f2bd787a0c56dc34b3ebb47073 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Sat, 10 May 2008 11:09:02 +0200 Subject: Resolve some merge conflicts. --- inotail.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'inotail.c') diff --git a/inotail.c b/inotail.c index 4195e13..d708f1f 100644 --- a/inotail.c +++ b/inotail.c @@ -57,7 +57,7 @@ static const struct option long_opts[] = { { NULL, 0, NULL, 0 } }; -static void *emalloc(size_t size) +static void *emalloc(const size_t size) { void *ret = malloc(size); @@ -698,7 +698,7 @@ int main(int argc, char **argv) int i, c, ret = 0; int n_files; unsigned long n_units = DEFAULT_N_LINES; - mode_t mode = M_LINES; + char mode = M_LINES; char forever = 0; char **filenames; struct file_struct *files = NULL; -- cgit v1.2.3-54-g00ecf