aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'qmerge.c')
-rw-r--r--qmerge.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/qmerge.c b/qmerge.c
index 5a9e8a7..cb23841 100644
--- a/qmerge.c
+++ b/qmerge.c
@@ -1,13 +1,14 @@
/*
* Copyright 2005-2006 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v 1.22 2006/01/24 01:02:26 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v 1.23 2006/01/24 23:35:08 vapier Exp $
*
* Copyright 2005-2006 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2006 Mike Frysinger - <vapier@gentoo.org>
*/
-#ifdef APPLET_qmerge
+#ifndef OMIT_QMERGE
+
/*
--nofiles don't verify files in package
--noscript don't execute %verifyscript (if any)
@@ -45,7 +46,7 @@ static const char *qmerge_opts_help[] = {
COMMON_OPTS_HELP
};
-static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.22 2006/01/24 01:02:26 solar Exp $";
+static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.23 2006/01/24 23:35:08 vapier Exp $";
#define qmerge_usage(ret) usage(ret, QMERGE_FLAGS, qmerge_long_opts, qmerge_opts_help, lookup_applet_idx("qmerge"))
char pretend = 0;
@@ -1391,9 +1392,4 @@ int qmerge_main(int argc, char **argv) {
return parse_packages(Packages, ARGC, ARGV);
}
-#else /* ! APPLET_qmerge */
-int qmerge_main(int argc, char **argv) {
- errf("%s%s%s", err_noapplet, DKGREEN, NORM);
-}
-#endif /* APPLET_qmerge */
-
+#endif