Resolve some merge conflicts.

2 files changed, 3 insertions, 4 deletions

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;
diff --git a/inotail.h b/inotail.h
index ea680cb..4c1ca4d 100644
--- a/inotail.h
+++ b/inotail.h
@@ -12,12 +12,11 @@
 
 #define DEFAULT_N_LINES 10	/* Number of items to tail. */
 
-#define DEFAULT_BUFFER_SIZE 4096
 /* inotify event buffer length for one file */
 #define INOTIFY_BUFLEN (4 * sizeof(struct inotify_event))
 
 /* tail modes */
-typedef enum { M_LINES, M_BYTES } mode_t;
+enum tail_mode { M_LINES, M_BYTES };
 
 /* Every tailed file is represented as a file_struct */
 struct file_struct {