@@ -11,6 +11,10 @@

 //

 //===----------------------------------------------------------------------===//

+/* this shouldn't be part of win32 proj at all, but its easier to exclude here

+ * */

+#ifndef _WIN32

+

 #include "llvm/Analysis/ConstantFolding.h"

 #include "llvm/Analysis/Dominators.h"

 #include "llvm/Analysis/LoopInfo.h"

@@ -318,4 +322,4 @@ void PointerTracking::print(raw_ostream &OS, const Module* M) const {

     }

   }

 }

-

+#endif

@@ -831,7 +831,8 @@ private:

 		    ostr << operand << " " ;

 		    V->print(ostr);

 		    Ty->print(ostr);

-		    cli_dbgmsg_internal("[Bytecode JIT]: %s\n", ostr.str().c_str());

+		    M->dump();

+		    cli_dbgmsg_internal("[Bytecode JIT]: operand %d: %s\n", operand,ostr.str().c_str());

 		}

 		llvm_report_error("(libclamav) Type mismatch converting operand");

 	    }

@@ -273,6 +273,21 @@ ssize_t w32_recv(int sockfd, void *buf, size_t len, int flags) {

     return (ssize_t)ret;

 }

+int w32_getpeername(int s, struct sockaddr *name, int *namelen)

+{

+    int ret = getpeername((SOCKET)s, name, namelen);

+    if (ret == SOCKET_ERROR) {

+	wsock2errno();

+	return -1;

+    }

+    return ret;

+}

+

+char *w32_inet_ntoa(struct sockaddr_in in)

+{

+    return inet_ntoa(in);

+}

+

 int w32_closesocket(int sockfd) {

     if(closesocket((SOCKET)sockfd) == SOCKET_ERROR) {

 	wsock2errno();

@@ -47,6 +47,8 @@ int poll_with_event(struct pollfd *fds, int nfds, int timeout, HANDLE event);

 int w32_accept(SOCKET sockfd, const struct sockaddr *addr, socklen_t *addrlen);

 int w32_listen(int sockfd, int backlog);

 int w32_shutdown(int sockfd, int how);

+int w32_getpeername(int sd, struct sockaddr *name, int *namelen);

+char *w32_inet_ntoa(struct sockaddr_in in);

 int fcntl(int fd, int cmd, ...);

 #endif

@@ -214,3 +214,5 @@ EXPORTS inet_addr @44343 NONAME

 EXPORTS fcntl @44344 NONAME

 EXPORTS cli_to_utf8_maybe_alloc @44345 NONAME

 EXPORTS cli_strdup_to_utf8 @44346 NONAME

+EXPORTS w32_inet_ntoa @44347 NONAME

+EXPORTS w32_getpeername @44348 NONAME

@@ -66,6 +66,8 @@ char *strptime(const char *s, const char *format, struct tm *tm);

 #define gai_strerror w32_strerror

 #define freeaddrinfo w32_freeaddrinfo

 #define inet_ntop w32_inet_ntop

+#define inet_ntoa w32_inet_ntoa

+#define getpeername w32_getpeername

 #define gethostbyname w32_gethostbyname

 #define select w32_select

 #define poll w32_poll