From: Karel Zak <kzak@redhat.com>
Date: Tue, 20 Dec 2011 10:41:24 +0000 (+0100)
Subject: losetup: remove obsolete #ifdef MAIN
X-Git-Tag: v2.21-rc1~111
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=653290586f5d119caa77397ebd33dd0de9070b58;p=thirdparty%2Futil-linux.git

losetup: remove obsolete #ifdef MAIN

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/mount/Makefile.am b/mount/Makefile.am
index 01b9567d59..71820c6e57 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 2ce30abb0b..222178ff9d 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 */