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

diff --git a/amiga.h b/amiga.h
index 6f132d0b..2701923b 100644
--- a/amiga.h
+++ b/amiga.h
@@ -1,10 +1,10 @@
 #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.5 2001/07/29 18:43:08 jongfoster Exp $"
 /*********************************************************************
  *
- * File        :  $Source: /home/administrator/cvs/ijb/amiga.h,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/amiga.h,v $
  *
  * Purpose     :  Amiga-specific declarations.
  *
@@ -30,7 +30,24 @@
  *                Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  * Revisions   :
- *    $Log: jcc.h,v $
+ *    $Log: amiga.h,v $
+ *    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
+ *
  *
  *********************************************************************/
 
@@ -43,6 +60,7 @@
 #include <proto/socket.h>
 #undef __NOLIBBASE__
 
+#define __CONSTLIBBASEDECL__ const
 #include <proto/exec.h>
 #include <exec/tasks.h>
 #include <proto/dos.h>
@@ -50,8 +68,8 @@
 
 struct UserData
 {
-	struct Library *sb;
-	int eno;
+   struct Library *sb;
+   int eno;
 };
 
 #define SocketBase ((struct Library *)(((struct UserData *)(FindTask(NULL)->tc_UserData))->sb))
@@ -67,22 +85,29 @@ void amiga_exit(void);
 void __memCleanUp(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);\
-      }\
-   }\
+#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 EINTR
 #define EINTR 0
 
-#endif /* ndef _AMIGA_H */
+#endif /* ndef AMIGA_H_INCLUDED */
 #endif /* def AMIGA */