summaryrefslogtreecommitdiffstats
path: root/src/pacman/pacman.c
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-04-25 08:21:12 +0200
committerDan McGee <dan@archlinux.org>2007-04-25 17:07:47 +0200
commit5e1419c0b5cf717e57959bc27eeab1cfa4bea5dc (patch)
tree446f884852a55db94bc50bbfe7ef42a1b45a152a /src/pacman/pacman.c
parent339caa61ef4b52a450bf0ce785fd68c38b546be1 (diff)
downloadpacman-5e1419c0b5cf717e57959bc27eeab1cfa4bea5dc.tar.gz
pacman-5e1419c0b5cf717e57959bc27eeab1cfa4bea5dc.tar.xz
Merge single-function header files on pacman side
Having a seperate header file for add, remove, query, etc. seemed overkill. Merge them all into a common pacman.h and fix the necessary #includes. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src/pacman/pacman.c')
-rw-r--r--src/pacman/pacman.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 483a7bbf..5fd32ba7 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -28,9 +28,9 @@
#include <getopt.h>
#include <string.h>
#include <signal.h>
+#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <unistd.h>
#include <libintl.h>
#include <locale.h>
#if defined(__APPLE__)
@@ -44,21 +44,17 @@
#endif
#include <time.h>
+/* alpm */
#include <alpm.h>
#include <alpm_list.h>
/* pacman */
+#include "pacman.h"
#include "util.h"
#include "log.h"
#include "downloadprog.h"
#include "conf.h"
#include "package.h"
-#include "add.h"
-#include "remove.h"
-#include "upgrade.h"
-#include "query.h"
-#include "sync.h"
-#include "deptest.h"
#if defined(__OpenBSD__) || defined(__APPLE__)
#define BSD