-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.27 2002/03/13 00:27:05 jongfoster Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.33 2002/04/03 16:02:18 gliptak Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
*
* Purpose : Contains wrappers for system-specific sockets code,
- * so that the rest of JunkBuster can be more
+ * so that the rest of Junkbuster can be more
* OS-independent. Contains #ifdefs to make this work
* on many platforms.
*
* Copyright : Written by and Copyright (C) 2001 the SourceForge
- * Privoxy team. http://ijbswa.sourceforge.net
+ * Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* by and Copyright (C) 1997 Anonymous Coders and
*
* 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.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
+ *
* Revision 1.27 2002/03/13 00:27:05 jongfoster
* Killing warnings
*
* - Fixed compiler warnings etc
*
* Revision 1.23 2002/03/05 00:36:01 jongfoster
- * Fixing bug 514988 - unable to restart JunkBuster
+ * Fixing bug 514988 - unable to restart Junkbuster
*
* 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!)
#ifdef _WIN32
+#ifndef STRICT
+#define STRICT
+#endif
#include <windows.h>
#include <sys/timeb.h>
#include <io.h>
#ifndef _WIN32
/*
* This is not needed for Win32 - in fact, it stops
- * duplicate instances of JunkBuster from being caught.
+ * duplicate instances of Junkbuster from being caught.
*
* On UNIX, we assume the user is sensible enough not
- * to start JunkBuster multiple times on the same IP.
- * Without this, stopping and restarting JunkBuster
+ * to start Junkbuster multiple times on the same IP.
+ * Without this, stopping and restarting Junkbuster
* from a script fails.
* Note: SO_REUSEADDR is meant to only take over
* sockets which are *not* in listen state in Linux,
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;