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

commit 46443c7a647933bb01f8e3b03ee3fae8e9289831
Author: Michel Hermier <[email protected]>
Date:   Wed Dec 11 09:52:45 2013 +0100

libpacman: Some includes rework.

diff --git a/lib/libpacman/conflict.c b/lib/libpacman/conflict.c
index 953aacc..f721994 100644
--- a/lib/libpacman/conflict.c
+++ b/lib/libpacman/conflict.c
@@ -23,17 +23,13 @@
*  USA.
*/

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

/* pacman-g2 */
#include "conflict.h"
diff --git a/lib/libpacman/db.c b/lib/libpacman/db.c
index 30a3132..c446145 100644
--- a/lib/libpacman/db.c
+++ b/lib/libpacman/db.c
@@ -23,23 +23,16 @@
*  USA.
*/

-#if defined(__APPLE__) || defined(__OpenBSD__)
-#include <sys/syslimits.h>
-#include <sys/stat.h>
-#endif
-
#include "config.h"
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
+
#include <sys/stat.h>
#include <dirent.h>
-#include <libintl.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.h"
diff --git a/lib/libpacman/deps.c b/lib/libpacman/deps.c
index c51ce64..6a91641 100644
--- a/lib/libpacman/deps.c
+++ b/lib/libpacman/deps.c
@@ -22,13 +22,10 @@
*/

#include "config.h"
+
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#ifdef __sun__
-#include <strings.h>
-#endif
-#include <libintl.h>

/* pacman-g2 */
#include "deps.h"
diff --git a/lib/libpacman/package.c b/lib/libpacman/package.c
index acbafe5..3d30f2d 100644
--- a/lib/libpacman/package.c
+++ b/lib/libpacman/package.c
@@ -23,14 +23,13 @@
*/

#include "config.h"
+
+#include <sys/utsname.h>
+#include <fcntl.h>
+#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
-#include <limits.h>
-#include <fcntl.h>
#include <string.h>
-#include <libintl.h>
-#include <locale.h>
-#include <sys/utsname.h>

/* pacman-g2 */
#include "package.h"
diff --git a/lib/libpacman/pacman.c b/lib/libpacman/pacman.c
index 4a13fa0..6a629c2 100644
--- a/lib/libpacman/pacman.c
+++ b/lib/libpacman/pacman.c
@@ -23,19 +23,17 @@
*/

#include "config.h"
-#include <stdio.h>
-#include <stdlib.h>
+
+#include <sys/stat.h>
+#include <sys/types.h>
#include <errno.h>
#include <fcntl.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <time.h>
-#include <syslog.h>
#include <limits.h> /* PATH_MAX */
#include <stdarg.h>
-#include <libintl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>

/* pacman-g2 */
#include "pacman.h"
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to