X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=para.h;h=3f05079740160c8aed96c1bf068696c8ca7872c3;hp=9c0618f783afad96a4f71c267dfd349c8e539c67;hb=b7cbaf0b4dc832e8277b5867505dac59bb803d44;hpb=adbf9f09c9bf2a680c61b1ef3541c04f1cde97cf

diff --git a/para.h b/para.h
index 9c0618f7..3f050797 100644
--- a/para.h
+++ b/para.h
@@ -23,25 +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 <sys/ipc.h>
-#include <sys/sem.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 */
@@ -49,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
@@ -122,7 +116,6 @@ int para_open_audiod_pipe(char *);
 int read_audiod_pipe(int, void (*)(char *));
 
 /* exec */
-int file_exists(const char *);
 int para_exec_cmdline_pid(pid_t *pid, const char *cmdline, int *fds);
 
 /* signal */
@@ -158,9 +151,10 @@ enum {
 	SI_AUDIOD_UPTIME,	SI_SELECTOR,		NUM_STAT_ITEMS
 };
 
+int stat_item_valid(const char *item);
 int stat_line_valid(const char *);
-void stat_client_write(char *msg);
-int stat_client_add(int);
+void stat_client_write(char *msg, int itemnum);
+int stat_client_add(int fd, long unsigned mask);
 void dump_empty_status(void);
 unsigned for_each_line(char *, int, void (*)(char *));
 
@@ -221,6 +215,3 @@ __printf_2_3 void para_log(int, const char*, ...);
 		p = para_realloc(p, size); \
 	} \
 }
-
-
-