Sync with various changes from 3.0 branch. Add two new files for config stuff.

[privoxy.git] / jbsockets.c

diff --git a/jbsockets.c b/jbsockets.c
index 1a6485d..9ee4315 100644 (file)
--- a/jbsockets.c
+++ b/jbsockets.c
@@ -1,4 +1,4 @@
-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.33 2002/04/03 16:02:18 gliptak Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.35 2002/04/26 15:50:04 joergs Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
@@ -35,6 +35,12 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.33 2002/04/03 16:02:18 glipta
  *
  * Revisions   :
  *    $Log: jbsockets.c,v $
+ *    Revision 1.35  2002/04/26 15:50:04  joergs
+ *    AmigaOS: No socklen_t, added AMIGA to the systems using int instead.
+ *
+ *    Revision 1.34  2002/04/08 20:31:41  swa
+ *    fixed JB spelling
+ *
  *    Revision 1.33  2002/04/03 16:02:18  gliptak
  *    Correcting compile warning with older gcc
  *
@@ -390,7 +396,11 @@ jb_socket connect_to(const char *host, int portnum, struct client_state *csp)
  *                nonzero on error.
  *
  *********************************************************************/
+#ifdef AMIGA
+int write_socket(jb_socket fd, const char *buf, ssize_t len)
+#else
 int write_socket(jb_socket fd, const char *buf, size_t len)
+#endif
 {
    if (len == 0)
    {
@@ -634,7 +644,7 @@ int accept_connection(struct client_state * csp, jb_socket fd)
    struct sockaddr_in client, server;
    struct hostent *host = NULL;
    jb_socket afd;
-#if defined(_WIN32) || defined(__OS2__) || defined(__APPLE_CC__)
+#if defined(_WIN32) || defined(__OS2__) || defined(__APPLE_CC__) || defined(AMIGA)
    /* Wierdness - fix a warning. */
    int c_length, s_length;
 #else