#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.11 2006/07/18 14:48:45 david__schmidt 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
* and/or modify it under the terms of the GNU General
* Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* Revisions :
- * $Log: jcc.h,v $
+ * $Log: amiga.h,v $
+ * Revision 1.11 2006/07/18 14:48:45 david__schmidt
+ * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+ * with what was really the latest development (the v_3_0_branch branch)
+ *
+ * Revision 1.9 2002/03/26 22:29:54 swa
+ * we have a new homepage!
+ *
+ * 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
+ *
*
*********************************************************************/
\f
#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>
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)
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 */