diff options
author | Karel Zak | 2011-12-20 11:41:24 +0100 |
---|---|---|
committer | Karel Zak | 2011-12-20 11:41:24 +0100 |
commit | 653290586f5d119caa77397ebd33dd0de9070b58 (patch) | |
tree | c0998129775609cd22c841ffa8ba47fb70a4218b | |
parent | libmount: don't use "new" in header file (diff) | |
download | kernel-qcow2-util-linux-653290586f5d119caa77397ebd33dd0de9070b58.tar.gz kernel-qcow2-util-linux-653290586f5d119caa77397ebd33dd0de9070b58.tar.xz kernel-qcow2-util-linux-653290586f5d119caa77397ebd33dd0de9070b58.zip |
losetup: remove obsolete #ifdef MAIN
Signed-off-by: Karel Zak <kzak@redhat.com>
-rw-r--r-- | mount/Makefile.am | 2 | ||||
-rw-r--r-- | mount/lomount.c | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/mount/Makefile.am b/mount/Makefile.am index 01b9567d5..71820c6e5 100644 --- a/mount/Makefile.am +++ b/mount/Makefile.am @@ -52,7 +52,6 @@ swapon_LDADD = $(ldadd_common) losetup_SOURCES = lomount.c $(srcs_common) loop.h lomount.h \ $(top_srcdir)/lib/strutils.c -losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS) mount_static_LDADD = @@ -76,7 +75,6 @@ if HAVE_STATIC_LOSETUP bin_PROGRAMS += losetup.static losetup_static_SOURCES = $(losetup_SOURCES) losetup_static_LDFLAGS = $(ldflags_static) -losetup_static_CPPFLAGS = -DMAIN $(AM_CPPFLAGS) endif diff --git a/mount/lomount.c b/mount/lomount.c index 2ce30abb0..222178ff9 100644 --- a/mount/lomount.c +++ b/mount/lomount.c @@ -15,6 +15,8 @@ #include <sys/sysmacros.h> #include <inttypes.h> #include <dirent.h> +#include <getopt.h> +#include <stdarg.h> #include "loop.h" #include "lomount.h" @@ -448,8 +450,6 @@ find_loopdev_by_backing_file(const char *filename, char **loopdev) return devs_n ? 2 : 1; /* more loopdevs or error */ } -#ifdef MAIN - static int set_capacity(const char *device) { @@ -610,9 +610,6 @@ show_associated_loop_devices(char *filename, unsigned long long offset, int isof return 0; } - -#endif /* MAIN */ - /* check if the loopfile is already associated with the same given * parameters. * @@ -1026,12 +1023,8 @@ find_loopdev_by_backing_file(const char *filename, char **loopdev) #endif /* !LOOP_SET_FD */ -#ifdef MAIN - #ifdef LOOP_SET_FD -#include <getopt.h> -#include <stdarg.h> static void usage(FILE *out) { @@ -1263,4 +1256,3 @@ main(int argc, char **argv) { return -1; } #endif /* !LOOP_SET_FD*/ -#endif /* MAIN */ |