X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=amiga.h;h=46cf2d3b2e35e49f48b05e7a9e987784c1e18c63;hp=580dc32dd6b63798cce4090621a3b8177dde3dec;hb=5f21a3aee58b4691fb12b96d7339b7dac69f11c1;hpb=97110184221edacdb7d4dfc29de0e38d63f4d831

diff --git a/amiga.h b/amiga.h
index 580dc32d..46cf2d3b 100644
--- a/amiga.h
+++ b/amiga.h
@@ -1,7 +1,7 @@
 #ifdef AMIGA
 #ifndef AMIGA_H_INCLUDED
 #define AMIGA_H_INCLUDED
-#define AMIGA_H_VERSION "$Id: amiga.h,v 1.8 2002/03/24 13:25:43 swa Exp $"
+#define AMIGA_H_VERSION "$Id: amiga.h,v 1.13 2009/05/16 13:27:20 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/amiga.h,v $
@@ -11,7 +11,7 @@
  * Copyright   :  Written by and Copyright (C) 2001 the SourceForge
  *                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,48 +29,20 @@
  *                or write to the Free Software Foundation, Inc., 59
  *                Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * Revisions   :
- *    $Log: amiga.h,v $
- *    Revision 1.8  2002/03/24 13:25:43  swa
- *    name change related issues
- *
- *    Revision 1.7  2002/03/03 09:18:03  joergs
- *    Made jumbjuster work on AmigaOS again.
- *
- *    Revision 1.6  2001/10/13 12:46:08  joergs
- *    Added #undef EINTR to avoid warnings
- *
- *    Revision 1.5  2001/07/29 18:43:08  jongfoster
- *    Changing #ifdef _FILENAME_H to FILENAME_H_INCLUDED, to conform to
- *    ANSI C rules.
- *
- *    Revision 1.4  2001/05/29 20:05:06  joergs
- *    Fixed exit() macro not exiting if called before InitAmiga()
- *    (junkbuster --help and --version).
- *
- *    Revision 1.3  2001/05/25 21:53:27  jongfoster
- *    Fixing indentation
- *
- *    Revision 1.2  2001/05/23 00:13:58  joergs
- *    AmigaOS support fixed.
- *
- *    Revision 1.1.1.1  2001/05/15 13:58:46  oes
- *    Initial import of version 2.9.3 source tree
- *
- *
  *********************************************************************/
-
+
 
 #define _KERNEL
 #include <sys/socket.h>
 #undef _KERNEL
 
 #define __NOLIBBASE__
+#define __NOGLOBALIFACE__
 #include <proto/socket.h>
 #undef __NOLIBBASE__
+#undef __NOGLOBALIFACE__
 
 #define __CONSTLIBBASEDECL__ const
-#define DEVICES_TIMER_H
 #include <proto/exec.h>
 #include <exec/tasks.h>
 #include <proto/dos.h>
@@ -78,11 +50,20 @@
 
 struct UserData
 {
+#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)
@@ -93,8 +74,35 @@ 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);
 
+#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)                                            \
@@ -116,6 +124,12 @@ __saveds ULONG server_thread(void);
    }                                                        \
 }
 
+#undef HAVE_RANDOM
+#define h_errno 0
+#define HAVE_TIMEGM
+#define timegm(tm) mktime(tm)
+#endif /* __amigaos4__ */
+
 #undef EINTR
 #define EINTR 0