projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
151e38e
)
Fixing 2 compiler warnings under Win32
author
jongfoster
<jongfoster@users.sourceforge.net>
Thu, 13 Sep 2001 20:11:46 +0000
(20:11 +0000)
committer
jongfoster
<jongfoster@users.sourceforge.net>
Thu, 13 Sep 2001 20:11:46 +0000
(20:11 +0000)
jbsockets.c
patch
|
blob
|
history
diff --git
a/jbsockets.c
b/jbsockets.c
index
7284820
..
b64c110
100644
(file)
--- a/
jbsockets.c
+++ b/
jbsockets.c
@@
-1,4
+1,4
@@
-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.1
5 2001/07/29 17:40:43
jongfoster Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.1
6 2001/07/30 22:08:36
jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
@@
-35,6
+35,12
@@
const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.15 2001/07/29 17:40:43 jongfo
*
* Revisions :
* $Log: jbsockets.c,v $
*
* Revisions :
* $Log: jbsockets.c,v $
+ * 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
*
* Revision 1.15 2001/07/29 17:40:43 jongfoster
* Fixed compiler warning by adding a cast
*
@@
-182,14
+188,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));
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))
if (sizeof(inaddr.sin_port) == sizeof(short))
+#endif /* ndef _WIN32 */
{
inaddr.sin_port = htons((short)portnum);
}
{
inaddr.sin_port = htons((short)portnum);
}
+#ifndef _WIN32
else
{
inaddr.sin_port = htonl(portnum);
}
else
{
inaddr.sin_port = htonl(portnum);
}
+#endif /* ndef _WIN32 */
if ((fd = socket(inaddr.sin_family, SOCK_STREAM, 0)) < 0)
{
if ((fd = socket(inaddr.sin_family, SOCK_STREAM, 0)) < 0)
{
@@
-379,14
+389,18
@@
int bind_port(const char *hostnam, int portnum)
inaddr.sin_family = AF_INET;
inaddr.sin_addr.s_addr = resolve_hostname_to_ip(hostnam);
inaddr.sin_family = AF_INET;
inaddr.sin_addr.s_addr = resolve_hostname_to_ip(hostnam);
+#ifndef _WIN32
if (sizeof(inaddr.sin_port) == sizeof(short))
if (sizeof(inaddr.sin_port) == sizeof(short))
+#endif /* ndef _WIN32 */
{
inaddr.sin_port = htons((short)portnum);
}
{
inaddr.sin_port = htons((short)portnum);
}
+#ifndef _WIN32
else
{
inaddr.sin_port = htonl(portnum);
}
else
{
inaddr.sin_port = htonl(portnum);
}
+#endif /* ndef _WIN32 */
fd = socket(AF_INET, SOCK_STREAM, 0);
fd = socket(AF_INET, SOCK_STREAM, 0);