X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=jbsockets.c;h=72937c4488ccb8da69189ecb1b6772e8c2efc9d9;hb=ffa56d7551e4a8d1d7935d4f4b8d6a7320b469ae;hp=3edd7f19c0f8c52b7cf4481d080f257f23ef583c;hpb=97110184221edacdb7d4dfc29de0e38d63f4d831;p=privoxy.git diff --git a/jbsockets.c b/jbsockets.c index 3edd7f19..72937c44 100644 --- a/jbsockets.c +++ b/jbsockets.c @@ -1,4 +1,4 @@ -const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.28 2002/03/24 13:25:43 swa Exp $"; +const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.32 2002/03/31 17:18:59 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $ @@ -35,6 +35,18 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.28 2002/03/24 13:25:43 swa Ex * * Revisions : * $Log: jbsockets.c,v $ + * 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.30 2002/03/27 14:32:43 david__schmidt + * More compiler warning message maintenance + * + * Revision 1.29 2002/03/26 22:29:54 swa + * we have a new homepage! + * * Revision 1.28 2002/03/24 13:25:43 swa * name change related issues * @@ -170,6 +182,9 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.28 2002/03/24 13:25:43 swa Ex #ifdef _WIN32 +#ifndef STRICT +#define STRICT +#endif #include #include #include @@ -616,11 +631,11 @@ int accept_connection(struct client_state * csp, jb_socket fd) struct sockaddr_in client, server; struct hostent *host = NULL; jb_socket afd; -#ifdef _WIN32 - /* Microsoft wierdness - fix a warning. */ +#if defined(_WIN32) || defined(__OS2__) || defined(__APPLE_CC__) + /* Wierdness - fix a warning. */ int c_length, s_length; #else - size_t c_length, s_length; + socklen_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;