X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=para.h;h=3f05079740160c8aed96c1bf068696c8ca7872c3;hp=6c853611e381f2ef2a8aef954746520107d16b3a;hb=f6c929d9e580bb1f2666236b16de1e3fe73878d3;hpb=7062b8a307355422f2c69b44b65f23eab17ce15d

diff --git a/para.h b/para.h
index 6c853611..3f050797 100644
--- a/para.h
+++ b/para.h
@@ -23,23 +23,19 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/wait.h>
-#include <signal.h>
-#include <sys/signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <time.h> /* time(), localtime() */
 #include <unistd.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>
-#include <stropts.h>
-#include <poll.h>
-#include <sys/socket.h>
+#include <ctype.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <ctype.h>
+#include <sys/socket.h>
 #include <sys/un.h> /* needed by create_pf_socket */
+#include <string.h>
 #include "gcc-compat.h"
 
 /* some internal constants */
@@ -47,9 +43,9 @@
 #define MAXLINE 255
 
 
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#define ABS(a) ((a) > 0 ? (a) : -(a))
+#define PARA_MIN(a,b) ((a) < (b) ? (a) : (b))
+#define PARA_MAX(a,b) ((a) > (b) ? (a) : (b))
+#define PARA_ABS(a) ((a) > 0 ? (a) : -(a))
 
 /* Loglevels */
 #define DEBUG 1
@@ -219,6 +215,3 @@ __printf_2_3 void para_log(int, const char*, ...);
 		p = para_realloc(p, size); \
 	} \
 }
-
-
-