From a8b62e421ef49ecf3180600d83a010d7af5b1d75 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 26 Dec 2010 14:51:21 +0300 Subject: [PATCH] (warn_same_file): cleanup of preprocessing usage. Signed-off-by: Andrew Borodin --- src/filemanager/file.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/filemanager/file.c b/src/filemanager/file.c index 527464661..1b8be52de 100644 --- a/src/filemanager/file.c +++ b/src/filemanager/file.c @@ -462,30 +462,24 @@ real_warn_same_file (enum OperationMode mode, const char *fmt, const char *a, co /* --------------------------------------------------------------------------------------------- */ -#ifdef WITH_BACKGROUND static FileProgressStatus warn_same_file (const char *fmt, const char *a, const char *b) { +#ifdef WITH_BACKGROUND union { void *p; - FileProgressStatus (*f) (enum OperationMode, const char *fmt, - const char *a, const char *b); + FileProgressStatus (*f) (enum OperationMode, const char *fmt, + const char *a, const char *b); } pntr; + pntr.f = real_warn_same_file; if (we_are_background) return parent_call (pntr.p, NULL, 3, strlen (fmt), fmt, strlen (a), a, strlen (b), b); - else - return real_warn_same_file (Foreground, fmt, a, b); -} -#else -static FileProgressStatus -warn_same_file (const char *fmt, const char *a, const char *b) -{ +#endif return real_warn_same_file (Foreground, fmt, a, b); } -#endif /* --------------------------------------------------------------------------------------------- */ -- 2.11.4.GIT