Signed-off-by: Christoph Hellwig <[email protected]>

---
 include/logger.h |   27 ---------------------------
 lib/logger.c     |   27 +++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 27 deletions(-)

Index: sheepdog/include/logger.h
===================================================================
--- sheepdog.orig/include/logger.h      2012-08-06 16:50:37.460006320 +0200
+++ sheepdog/include/logger.h   2012-08-06 16:51:46.333339692 +0200
@@ -14,38 +14,11 @@
 #ifndef LOGGER_H
 #define LOGGER_H
 
-#include <sys/sem.h>
 #include <sys/syslog.h>
 
-union semun {
-       int val;
-       struct semid_ds *buf;
-       unsigned short int *array;
-       struct seminfo *__buf;
-};
-
 #define LOG_SPACE_SIZE 1048576
 #define MAX_MSG_SIZE 256
 
-struct logmsg {
-       short int prio;
-       void *next;
-       char *str;
-};
-
-struct logarea {
-       int empty;
-       int active;
-       void *head;
-       void *tail;
-       void *start;
-       void *end;
-       char *buff;
-       int semid;
-       union semun semarg;
-       int fd;
-};
-
 extern int log_init(char *progname, int size, int to_stdout, int level,
                char *outfile);
 extern void log_close(void);
Index: sheepdog/lib/logger.c
===================================================================
--- sheepdog.orig/lib/logger.c  2012-08-06 16:50:42.416672989 +0200
+++ sheepdog/lib/logger.c       2012-08-06 16:51:46.333339692 +0200
@@ -28,6 +28,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/prctl.h>
+#include <sys/sem.h>
 #include <pthread.h>
 #include <libgen.h>
 
@@ -47,6 +48,32 @@ static int log_enqueue(int prio, const c
 static void dolog(int prio, const char *func, int line, const char *fmt,
                  va_list ap) __attribute__ ((format (printf, 4, 0)));
 
+union semun {
+       int val;
+       struct semid_ds *buf;
+       unsigned short int *array;
+       struct seminfo *__buf;
+};
+
+struct logarea {
+       int empty;
+       int active;
+       void *head;
+       void *tail;
+       void *start;
+       void *end;
+       char *buff;
+       int semid;
+       union semun semarg;
+       int fd;
+};
+
+struct logmsg {
+       short int prio;
+       void *next;
+       char *str;
+};
+
 static __thread const char *worker_name;
 static __thread int worker_idx;
 static struct logarea *la;

-- 
sheepdog mailing list
[email protected]
http://lists.wpkg.org/mailman/listinfo/sheepdog

Reply via email to