Include winsock.h rather than arpa/inet.h on mingw platforms.

Also fix a trivial int/long mismatch.

diff --git a/librazor/rpm.c b/librazor/rpm.c
index f271e7a..d8cbb0e 100644 (file)
--- a/librazor/rpm.c
+++ b/librazor/rpm.c
@@ -30,7 +30,11 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <unistd.h>
+#if MSWIN_API
+#include <winsock.h>   /* For ntohl() */
+#else
 #include <arpa/inet.h>
+#endif
 #include <limits.h>
 #include <zlib.h>
 #include <assert.h>
@@ -824,7 +828,7 @@ razor_importer_add_rpm(struct razor_importer *importer, struct razor_rpm *rpm)
        license = razor_rpm_get_indirect(rpm, RPMTAG_LICENSE, NULL);
 
        if (epoch) {
-               snprintf(buf, sizeof buf, "%u", ntohl(*epoch));
+               snprintf(buf, sizeof buf, "%lu", ntohl(*epoch));
                razor_build_evr(evr, sizeof evr, buf, version, release);
        } else {
                razor_build_evr(evr, sizeof evr, NULL, version, release);