Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=24f884fae67683aaa4245eb2c790ed6cd1c9ebde

commit 24f884fae67683aaa4245eb2c790ed6cd1c9ebde
Author: Michel Hermier <[email protected]>
Date:   Wed Dec 11 09:46:54 2013 +0100

libpacman: Reorder/remove some unecessary includes.

diff --git a/lib/libpacman/add.c b/lib/libpacman/add.c
index b1bc751..ded0dc3 100644
--- a/lib/libpacman/add.c
+++ b/lib/libpacman/add.c
@@ -23,21 +23,14 @@
*  USA.
*/

-#if defined(__APPLE__) || defined(__OpenBSD__)
-#include <sys/syslimits.h>
-#endif
-#if defined(__APPLE__) || defined(__OpenBSD__) || defined(__sun__)
-#include <sys/stat.h>
-#endif
-
#include "config.h"
-#include <stdlib.h>
+
#include <errno.h>
-#include <time.h>
#include <fcntl.h>
-#include <string.h>
#include <limits.h>
-#include <libintl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>

/* pacman-g2 */
#include "add.h"
diff --git a/lib/libpacman/cache.c b/lib/libpacman/cache.c
index cb41cdf..ecf86a4 100644
--- a/lib/libpacman/cache.c
+++ b/lib/libpacman/cache.c
@@ -21,14 +21,14 @@
*/

#include "config.h"
-#include <unistd.h>
+
+#include <sys/stat.h>
+#include <dirent.h>
+#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
-#include <errno.h>
#include <string.h>
-#include <sys/stat.h>
-#include <libintl.h>
-#include <dirent.h>
+#include <unistd.h>

/* pacman-g2 */
#include "cache.h"
diff --git a/lib/libpacman/config_parser.c b/lib/libpacman/config_parser.c
index 4515355..5528fdf 100644
--- a/lib/libpacman/config_parser.c
+++ b/lib/libpacman/config_parser.c
@@ -23,6 +23,8 @@
*/

#include "config.h"
+
+#include <limits.h> /* PATH_MAX */
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
@@ -33,9 +35,7 @@
#include <unistd.h>
#include <time.h>
#include <syslog.h>
-#include <limits.h> /* PATH_MAX */
#include <stdarg.h>
-#include <libintl.h>

/* pacman-g2 */
#include "pacman.h"
diff --git a/lib/libpacman/db/localdb.c b/lib/libpacman/db/localdb.c
index 5ef540e..485e41f 100644
--- a/lib/libpacman/db/localdb.c
+++ b/lib/libpacman/db/localdb.c
@@ -22,21 +22,14 @@

#include "config.h"

-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#ifdef __sun__
-#include <strings.h>
-#endif
#include <sys/stat.h>
#include <dirent.h>
-#include <libintl.h>
-#include <locale.h>
-#ifdef CYGWIN
+#include <errno.h>
#include <limits.h> /* PATH_MAX */
-#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>

/* pacman-g2 */
#include "db/localdb.h"
diff --git a/lib/libpacman/util.c b/lib/libpacman/util.c
index 78a602d..b80e164 100644
--- a/lib/libpacman/util.c
+++ b/lib/libpacman/util.c
@@ -45,7 +45,6 @@
#include <ctype.h>
#include <dirent.h>
#include <sys/wait.h>
-#include <libintl.h>
#ifdef CYGWIN
#include <limits.h> /* PATH_MAX */
#endif
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to