projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Done testing.
[privoxy.git]
/
jbsockets.c
diff --git
a/jbsockets.c
b/jbsockets.c
index
f8cc20c
..
1a6485d
100644
(file)
--- a/
jbsockets.c
+++ b/
jbsockets.c
@@
-1,10
+1,10
@@
-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.3
1 2002/03/29 03:33:13 david__schmidt
Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.3
3 2002/04/03 16:02:18 gliptak
Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
*
* Purpose : Contains wrappers for system-specific sockets code,
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
*
* Purpose : Contains wrappers for system-specific sockets code,
- * so that the rest of Junk
B
uster can be more
+ * so that the rest of Junk
b
uster can be more
* OS-independent. Contains #ifdefs to make this work
* on many platforms.
*
* OS-independent. Contains #ifdefs to make this work
* on many platforms.
*
@@
-35,6
+35,12
@@
const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.31 2002/03/29 03:33:13 david_
*
* Revisions :
* $Log: jbsockets.c,v $
*
* Revisions :
* $Log: jbsockets.c,v $
+ * Revision 1.33 2002/04/03 16:02:18 gliptak
+ * Correcting compile warning with older gcc
+ *
+ * Revision 1.32 2002/03/31 17:18:59 jongfoster
+ * Win32 only: Enabling STRICT to fix a VC++ compile warning.
+ *
* Revision 1.31 2002/03/29 03:33:13 david__schmidt
* Fix Mac OSX compiler warnings
*
* Revision 1.31 2002/03/29 03:33:13 david__schmidt
* Fix Mac OSX compiler warnings
*
@@
-85,7
+91,7
@@
const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.31 2002/03/29 03:33:13 david_
* - Fixed compiler warnings etc
*
* Revision 1.23 2002/03/05 00:36:01 jongfoster
* - Fixed compiler warnings etc
*
* Revision 1.23 2002/03/05 00:36:01 jongfoster
- * Fixing bug 514988 - unable to restart Junk
B
uster
+ * Fixing bug 514988 - unable to restart Junk
b
uster
*
* Revision 1.22 2002/03/04 02:08:02 david__schmidt
* Enable web editing of actions file on OS/2 (it had been broken all this time!)
*
* Revision 1.22 2002/03/04 02:08:02 david__schmidt
* Enable web editing of actions file on OS/2 (it had been broken all this time!)
@@
-563,11
+569,11
@@
int bind_port(const char *hostnam, int portnum, jb_socket *pfd)
#ifndef _WIN32
/*
* This is not needed for Win32 - in fact, it stops
#ifndef _WIN32
/*
* This is not needed for Win32 - in fact, it stops
- * duplicate instances of Junk
B
uster from being caught.
+ * duplicate instances of Junk
b
uster from being caught.
*
* On UNIX, we assume the user is sensible enough not
*
* On UNIX, we assume the user is sensible enough not
- * to start Junk
B
uster multiple times on the same IP.
- * Without this, stopping and restarting Junk
B
uster
+ * to start Junk
b
uster multiple times on the same IP.
+ * Without this, stopping and restarting Junk
b
uster
* from a script fails.
* Note: SO_REUSEADDR is meant to only take over
* sockets which are *not* in listen state in Linux,
* from a script fails.
* Note: SO_REUSEADDR is meant to only take over
* sockets which are *not* in listen state in Linux,
@@
-632,7
+638,7
@@
int accept_connection(struct client_state * csp, jb_socket fd)
/* Wierdness - fix a warning. */
int c_length, s_length;
#else
/* Wierdness - fix a warning. */
int c_length, s_length;
#else
- s
ize
_t c_length, s_length;
+ s
ocklen
_t c_length, s_length;
#endif
#if defined(HAVE_GETHOSTBYADDR_R_8_ARGS) || defined(HAVE_GETHOSTBYADDR_R_7_ARGS) || defined(HAVE_GETHOSTBYADDR_R_5_ARGS)
struct hostent result;
#endif
#if defined(HAVE_GETHOSTBYADDR_R_8_ARGS) || defined(HAVE_GETHOSTBYADDR_R_7_ARGS) || defined(HAVE_GETHOSTBYADDR_R_5_ARGS)
struct hostent result;