From 87240dae6d4631a812ee81ed53c1622dd164bfcf Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 1 Feb 2011 09:59:12 -0600
Subject: Fix locale.h/setlocale inclusion with --disable-nls
Noted in FS#22697. When I factored out _alpm_parsedate() into a common
function, I didn't move the <locale.h> include properly, causing a build
failure when NLS is disabled and this header isn't automatically included
everywhere.
Signed-off-by: Dan McGee <dan@archlinux.org>
---
lib/libalpm/be_local.c | 2 --
lib/libalpm/be_package.c | 1 -
lib/libalpm/be_sync.c | 1 -
lib/libalpm/util.c | 5 +++--
4 files changed, 3 insertions(+), 6 deletions(-)
(limited to 'lib/libalpm')
diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c
index 9602c825..c7110faf 100644
--- a/lib/libalpm/be_local.c
+++ b/lib/libalpm/be_local.c
@@ -30,7 +30,6 @@
#include <dirent.h>
#include <time.h>
#include <limits.h> /* PATH_MAX */
-#include <locale.h> /* setlocale */
/* libarchive */
#include <archive.h>
@@ -912,5 +911,4 @@ pmdb_t *_alpm_db_register_local(void)
return(db);
}
-
/* vim: set ts=2 sw=2 noet: */
diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c
index fa757214..7e46c08e 100644
--- a/lib/libalpm/be_package.c
+++ b/lib/libalpm/be_package.c
@@ -24,7 +24,6 @@
#include <stdlib.h>
#include <string.h>
#include <limits.h>
-#include <locale.h> /* setlocale */
#include <errno.h>
/* libarchive */
diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c
index bc17f1b9..f7101f54 100644
--- a/lib/libalpm/be_sync.c
+++ b/lib/libalpm/be_sync.c
@@ -21,7 +21,6 @@
#include "config.h"
#include <errno.h>
-#include <locale.h>
#include <limits.h>
/* libarchive */
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index 089b37cb..82387b2f 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -38,6 +38,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>
+#include <locale.h> /* setlocale */
/* libarchive */
#include <archive.h>
@@ -210,7 +211,7 @@ char *_alpm_strtrim(char *str)
}
/* Create a lock file */
-int _alpm_lckmk()
+int _alpm_lckmk(void)
{
int fd;
char *dir, *ptr;
@@ -240,7 +241,7 @@ int _alpm_lckmk()
}
/* Remove a lock file */
-int _alpm_lckrm()
+int _alpm_lckrm(void)
{
const char *file = alpm_option_get_lockfile();
if(unlink(file) == -1 && errno != ENOENT) {
--
cgit v1.2.3-2-g168b