summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-10-23 06:33:47 +0200
committerDan McGee <dan@archlinux.org>2007-10-23 06:37:38 +0200
commit0c4f7d821c1cd4ce559476595e2108f75b3dde7c (patch)
treed4568383740a4a2e04d1a939af94e13335c747f9 /lib
parent46eaa5c54200bfda402412e2f5b7df0eddc0230a (diff)
downloadpacman-0c4f7d821c1cd4ce559476595e2108f75b3dde7c.tar.gz
pacman-0c4f7d821c1cd4ce559476595e2108f75b3dde7c.tar.xz
Fix broken or missing includes
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/libalpm/server.c5
-rw-r--r--lib/libalpm/util.h12
2 files changed, 9 insertions, 8 deletions
diff --git a/lib/libalpm/server.c b/lib/libalpm/server.c
index f0bdcbcf..11a92033 100644
--- a/lib/libalpm/server.c
+++ b/lib/libalpm/server.c
@@ -22,13 +22,14 @@
#include "config.h"
#include <stdlib.h>
+#include <errno.h>
+#include <time.h>
#include <string.h>
+#include <limits.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
-#include <time.h>
-#include <errno.h>
#include <download.h>
/* libalpm */
diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h
index 5b6fac99..3154f470 100644
--- a/lib/libalpm/util.h
+++ b/lib/libalpm/util.h
@@ -27,20 +27,20 @@
#include <stdio.h>
#include <stdarg.h>
-#include <libintl.h> /* here so it doesn't need to be included elsewhere */
#include <time.h>
-#define FREE(p) do { if (p) { free(p); p = NULL; } } while(0)
-
-#define ASSERT(cond, action) do { if(!(cond)) { action; } } while(0)
-
-/* define _() as shortcut for gettext() */
#ifdef ENABLE_NLS
+#include <libintl.h> /* here so it doesn't need to be included elsewhere */
+/* define _() as shortcut for gettext() */
#define _(str) dgettext ("libalpm", str)
#else
#define _(s) s
#endif
+#define FREE(p) do { if (p) { free(p); p = NULL; } } while(0)
+
+#define ASSERT(cond, action) do { if(!(cond)) { action; } } while(0)
+
int _alpm_makepath(const char *path);
int _alpm_copyfile(const char *src, const char *dest);
char *_alpm_strtrim(char *str);