From f0f2ed47e265ca01dea3b8a217afc8b45690fc5e Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sun, 31 Aug 2003 14:34:25 +0000
Subject: resolv ed conbflict

git-svn-id: file:///home/lennart/svn/public/syrep/trunk@17 07ea20a6-d2c5-0310-9e02-9ef735347d72
---
 src/util.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/util.h')

diff --git a/src/util.h b/src/util.h
index 8b34022..b7fb571 100644
--- a/src/util.h
+++ b/src/util.h
@@ -57,7 +57,7 @@ int rm_rf(const char *root, int rec);
 ssize_t loop_read(int fd, void *d, size_t l);
 ssize_t loop_write(int fd, void *d, size_t l);
 
-int expand_file(int fd, size_t l);
-int filesize(int fd);
+int expand_file(int fd, off_t l);
+off_t filesize(int fd);
 
 #endif
-- 
cgit