X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jbsockets.c;h=3b36d9db3b249085e3b7db9f8d1e52e121cbea49;hp=728482038ddee5b15152a02851ba52114824cdb8;hb=9020dc00a095952008d4775f5fafc382e85022b9;hpb=536a88ebe11300228987eaa39ef4bbd63cd0e1ba

diff --git a/jbsockets.c b/jbsockets.c
index 72848203..3b36d9db 100644
--- a/jbsockets.c
+++ b/jbsockets.c
@@ -1,4 +1,4 @@
-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.15 2001/07/29 17:40:43 jongfoster Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.17 2001/09/13 20:11:46 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
@@ -35,6 +35,15 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.15 2001/07/29 17:40:43 jongfo
  *
  * Revisions   :
  *    $Log: jbsockets.c,v $
+ *    Revision 1.17  2001/09/13 20:11:46  jongfoster
+ *    Fixing 2 compiler warnings under Win32
+ *
+ *    Revision 1.16  2001/07/30 22:08:36  jongfoster
+ *    Tidying up #defines:
+ *    - All feature #defines are now of the form FEATURE_xxx
+ *    - Permanently turned off WIN_GUI_EDIT
+ *    - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS
+ *
  *    Revision 1.15  2001/07/29 17:40:43  jongfoster
  *    Fixed compiler warning by adding a cast
  *
@@ -119,6 +128,10 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.15 2001/07/29 17:40:43 jongfo
 #include <socket.h>
 #endif
 
+#ifdef __EMX__
+#include <sys/select.h>  /* OS/2/EMX needs a little help with select */
+#endif
+
 #endif
 
 #include "project.h"
@@ -182,14 +195,18 @@ int connect_to(const char *host, int portnum, struct client_state *csp)
    inaddr.sin_family      = AF_INET;
    csp->http->host_ip_addr_str = strdup(inet_ntoa(inaddr.sin_addr));
 
+#ifndef _WIN32
    if (sizeof(inaddr.sin_port) == sizeof(short))
+#endif /* ndef _WIN32 */
    {
       inaddr.sin_port = htons((short)portnum);
    }
+#ifndef _WIN32
    else
    {
       inaddr.sin_port = htonl(portnum);
    }
+#endif /* ndef _WIN32 */
 
    if ((fd = socket(inaddr.sin_family, SOCK_STREAM, 0)) < 0)
    {
@@ -379,14 +396,18 @@ int bind_port(const char *hostnam, int portnum)
    inaddr.sin_family      = AF_INET;
    inaddr.sin_addr.s_addr = resolve_hostname_to_ip(hostnam);
 
+#ifndef _WIN32
    if (sizeof(inaddr.sin_port) == sizeof(short))
+#endif /* ndef _WIN32 */
    {
       inaddr.sin_port = htons((short)portnum);
    }
+#ifndef _WIN32
    else
    {
       inaddr.sin_port = htonl(portnum);
    }
+#endif /* ndef _WIN32 */
 
    fd = socket(AF_INET, SOCK_STREAM, 0);