X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=amiga.h;h=46cf2d3b2e35e49f48b05e7a9e987784c1e18c63;hp=6f132d0b55db55c6a634fe5fc2568675b25a654a;hb=da1e7a2c6aef56965785d2fb6d025834186cb378;hpb=c75584ebcc79f939fb4ec9c8f842cef6692640c7

diff --git a/amiga.h b/amiga.h
index 6f132d0b..46cf2d3b 100644
--- a/amiga.h
+++ b/amiga.h
@@ -1,17 +1,17 @@
 #ifdef AMIGA
-#ifndef _AMIGA_H
-#define _AMIGA_H
-#define AMIGA_H_VERSION "$Id: amiga.h,v 1.1 2001/05/13 21:57:06 administrator Exp $"
+#ifndef AMIGA_H_INCLUDED
+#define AMIGA_H_INCLUDED
+#define AMIGA_H_VERSION "$Id: amiga.h,v 1.13 2009/05/16 13:27:20 fabiankeil Exp $"
 /*********************************************************************
  *
- * File        :  $Source: /home/administrator/cvs/ijb/amiga.h,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/amiga.h,v $
  *
  * Purpose     :  Amiga-specific declarations.
  *
  * Copyright   :  Written by and Copyright (C) 2001 the SourceForge
- *                IJBSWA team.  http://ijbswa.sourceforge.net
+ *                Privoxy team. http://www.privoxy.org/
  *
- *                This program is free software; you can redistribute it 
+ *                This program is free software; you can redistribute it
  *                and/or modify it under the terms of the GNU General
  *                Public License as published by the Free Software
  *                Foundation; either version 2 of the License, or (at
@@ -29,20 +29,20 @@
  *                or write to the Free Software Foundation, Inc., 59
  *                Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * Revisions   :
- *    $Log: jcc.h,v $
- *
  *********************************************************************/
-
+
 
 #define _KERNEL
 #include <sys/socket.h>
 #undef _KERNEL
 
 #define __NOLIBBASE__
+#define __NOGLOBALIFACE__
 #include <proto/socket.h>
 #undef __NOLIBBASE__
+#undef __NOGLOBALIFACE__
 
+#define __CONSTLIBBASEDECL__ const
 #include <proto/exec.h>
 #include <exec/tasks.h>
 #include <proto/dos.h>
@@ -50,11 +50,20 @@
 
 struct UserData
 {
-	struct Library *sb;
-	int eno;
+#ifdef __amigaos4__
+   struct SocketIFace *si;
+#else
+   struct Library *sb;
+#endif
+   int eno;
 };
 
+#ifdef __amigaos4__
+#define ISocket (((struct UserData *)(FindTask(NULL)->tc_UserData))->si)
+#undef errno
+#else
 #define SocketBase ((struct Library *)(((struct UserData *)(FindTask(NULL)->tc_UserData))->sb))
+#endif
 #define errno (((struct UserData *)(FindTask(NULL)->tc_UserData))->eno)
 #define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,NULL)
 #define inet_ntoa(x) Inet_NtoA(x.s_addr)
@@ -65,24 +74,64 @@ extern struct Task *main_task;
 void InitAmiga(void);
 void amiga_exit(void);
 void __memCleanUp(void);
-__saveds ULONG server_thread(void);
+SAVEDS ULONG server_thread(void);
 
-#define exit(x)\
-{\
-   if(main_task)\
-   {\
-      if(main_task == FindTask(NULL))\
-      {\
-         while(childs) Delay(10*TICKS_PER_SECOND); exit(x);\
-      } else {\
-         CloseLibrary(SocketBase);\
-         childs--;\
-         RemTask(NULL);\
-      }\
-   }\
+#ifdef __amigaos4__
+#define exit(x)                                             \
+{                                                           \
+   if(main_task)                                            \
+   {                                                        \
+      if(main_task == FindTask(NULL))                       \
+      {                                                     \
+         while(childs) Delay(10*TICKS_PER_SECOND); exit(x); \
+      }                                                     \
+      else                                                  \
+      {                                                     \
+         if (ISocket)                                       \
+         {                                                  \
+             struct Library *sb = ISocket->Data.LibBase;    \
+             DropInterface((struct Interface *)ISocket);    \
+             CloseLibrary(sb);                              \
+         }                                                  \
+         childs--;                                          \
+         RemTask(NULL);                                     \
+      }                                                     \
+   }                                                        \
+   else                                                     \
+   {                                                        \
+      exit(x);                                              \
+   }                                                        \
 }
+#else
+#define exit(x)                                             \
+{                                                           \
+   if(main_task)                                            \
+   {                                                        \
+      if(main_task == FindTask(NULL))                       \
+      {                                                     \
+         while(childs) Delay(10*TICKS_PER_SECOND); exit(x); \
+      }                                                     \
+      else                                                  \
+      {                                                     \
+         CloseLibrary(SocketBase);                          \
+         childs--;                                          \
+         RemTask(NULL);                                     \
+      }                                                     \
+   }                                                        \
+   else                                                     \
+   {                                                        \
+      exit(x);                                              \
+   }                                                        \
+}
+
+#undef HAVE_RANDOM
+#define h_errno 0
+#define HAVE_TIMEGM
+#define timegm(tm) mktime(tm)
+#endif /* __amigaos4__ */
 
+#undef EINTR
 #define EINTR 0
 
-#endif /* ndef _AMIGA_H */
+#endif /* ndef AMIGA_H_INCLUDED */
 #endif /* def AMIGA */