mirror of https://github.com/MidnightCommander/mc
(warn_same_file): cleanup of preprocessing usage.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
parent
a3344024c1
commit
a8b62e421e
|
@ -462,30 +462,24 @@ real_warn_same_file (enum OperationMode mode, const char *fmt, const char *a, co
|
||||||
|
|
||||||
/* --------------------------------------------------------------------------------------------- */
|
/* --------------------------------------------------------------------------------------------- */
|
||||||
|
|
||||||
#ifdef WITH_BACKGROUND
|
|
||||||
static FileProgressStatus
|
static FileProgressStatus
|
||||||
warn_same_file (const char *fmt, const char *a, const char *b)
|
warn_same_file (const char *fmt, const char *a, const char *b)
|
||||||
{
|
{
|
||||||
|
#ifdef WITH_BACKGROUND
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
void *p;
|
void *p;
|
||||||
FileProgressStatus (*f) (enum OperationMode, const char *fmt,
|
FileProgressStatus (*f) (enum OperationMode, const char *fmt,
|
||||||
const char *a, const char *b);
|
const char *a, const char *b);
|
||||||
} pntr;
|
} pntr;
|
||||||
|
|
||||||
pntr.f = real_warn_same_file;
|
pntr.f = real_warn_same_file;
|
||||||
|
|
||||||
if (we_are_background)
|
if (we_are_background)
|
||||||
return parent_call (pntr.p, NULL, 3, strlen (fmt), fmt, strlen (a), a, strlen (b), b);
|
return parent_call (pntr.p, NULL, 3, strlen (fmt), fmt, strlen (a), a, strlen (b), b);
|
||||||
else
|
#endif
|
||||||
return real_warn_same_file (Foreground, fmt, a, b);
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
static FileProgressStatus
|
|
||||||
warn_same_file (const char *fmt, const char *a, const char *b)
|
|
||||||
{
|
|
||||||
return real_warn_same_file (Foreground, fmt, a, b);
|
return real_warn_same_file (Foreground, fmt, a, b);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
/* --------------------------------------------------------------------------------------------- */
|
/* --------------------------------------------------------------------------------------------- */
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue