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

commit 7bb6eda1bc786b4df6ed7c50e366f2381478b3ba
Author: Michel Hermier <herm...@frugalware.org>
Date:   Wed Dec 11 10:15:42 2013 +0100

libpacman: Final remork of includes for now.

diff --git a/lib/libpacman/package/pkginfo.c b/lib/libpacman/package/pkginfo.c
index 7ef5943..0cde4ae 100644
--- a/lib/libpacman/package/pkginfo.c
+++ b/lib/libpacman/package/pkginfo.c
@@ -23,14 +23,11 @@
*/

#include "config.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/remove.c b/lib/libpacman/remove.c
index bab2d4f..178d7e5 100644
--- a/lib/libpacman/remove.c
+++ b/lib/libpacman/remove.c
@@ -26,14 +26,11 @@
#include "config.h"

#include <sys/stat.h>
-#include <stdlib.h>
#include <errno.h>
-#include <time.h>
#include <fcntl.h>
-#include <string.h>
#include <limits.h>
-#include <zlib.h>
-#include <libintl.h>
+#include <stdlib.h>
+#include <string.h>

/* pacman-g2 */
#include "remove.h"
diff --git a/lib/libpacman/server.c b/lib/libpacman/server.c
index 545e93a..9a021ed 100644
--- a/lib/libpacman/server.c
+++ b/lib/libpacman/server.c
@@ -20,16 +20,17 @@
*/

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

/* pacman-g2 */
diff --git a/lib/libpacman/sync.c b/lib/libpacman/sync.c
index 9ea84fc..714791b 100644
--- a/lib/libpacman/sync.c
+++ b/lib/libpacman/sync.c
@@ -23,16 +23,14 @@
*/

#include "config.h"
-#include <stdlib.h>
-#include <stdio.h>
+
+#include <dirent.h>
#include <fcntl.h>
+#include <limits.h> /* PATH_MAX */
+#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <time.h>
-#ifdef CYGWIN
-#include <limits.h> /* PATH_MAX */
-#endif
-#include <dirent.h>
-#include <libintl.h>

/* pacman-g2 */
#include "sync.h"
diff --git a/lib/libpacman/trans.c b/lib/libpacman/trans.c
index 9d0d58f..723b1ea 100644
--- a/lib/libpacman/trans.c
+++ b/lib/libpacman/trans.c
@@ -23,10 +23,10 @@
*/

#include "config.h"
-#include <stdlib.h>
+
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
-#include <libintl.h>

/* pacman-g2 */
#include "trans.h"
diff --git a/lib/libpacman/trans_sysupgrade.c b/lib/libpacman/trans_sysupgrade.c
index aa61c33..dd2cc67 100644
--- a/lib/libpacman/trans_sysupgrade.c
+++ b/lib/libpacman/trans_sysupgrade.c
@@ -24,16 +24,13 @@

#include "config.h"

+#include <dirent.h>
+#include <limits.h> /* PATH_MAX */
#include <stdlib.h>
#include <stdio.h>
#include <fcntl.h>
#include <string.h>
#include <time.h>
-#ifdef CYGWIN
-#include <limits.h> /* PATH_MAX */
-#endif
-#include <dirent.h>
-#include <libintl.h>

/* pacman-g2 */
#include "trans_sysupgrade.h"
diff --git a/lib/libpacman/versioncmp.c b/lib/libpacman/versioncmp.c
index 7306a90..f83e962 100644
--- a/lib/libpacman/versioncmp.c
+++ b/lib/libpacman/versioncmp.c
@@ -22,11 +22,11 @@
*/

#include "config.h"
-#include <stdlib.h>
-#include <stdio.h>
+
#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
-#include <libintl.h>

/* pacman-g2 */
#include "versioncmp.h"
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to