Explorar o código

Merge pull request #477 from tzimmofsecure/master

Fix compiler warnings on Android build using gcc-4.6.
bel2125 %!s(int64=8) %!d(string=hai) anos
pai
achega
c2780e2cec
Modificáronse 1 ficheiros con 3 adicións e 1 borrados
  1. 3 1
      src/civetweb.c

+ 3 - 1
src/civetweb.c

@@ -2201,7 +2201,9 @@ typedef struct tagTHREADNAME_INFO {
 
 #include <sys/prctl.h>
 #include <sys/sendfile.h>
+#ifdef ALTERNATIVE_QUEUE
 #include <sys/eventfd.h>
+#endif /* ALTERNATIVE_QUEUE */
 
 
 #if defined(ALTERNATIVE_QUEUE)
@@ -7406,7 +7408,7 @@ mg_inet_pton(int af, const char *src, void *dst, size_t dstlen)
 	ressave = res;
 
 	while (res) {
-		if (dstlen >= res->ai_addrlen) {
+		if (dstlen >= (size_t) res->ai_addrlen) {
 			memcpy(dst, res->ai_addr, res->ai_addrlen);
 			func_ret = 1;
 		}