From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 27 Jun 2014 07:05:32 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.9~84
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=01a2c5a3f16be97f1afe9cb40d802c4f8deed86c;p=i3%2Fi3

Merge branch 'master' into next
---

01a2c5a3f16be97f1afe9cb40d802c4f8deed86c
diff --cc include/ipc.h
index b6ee9839,5fa4334a..e9358ee5
--- a/include/ipc.h
+++ b/include/ipc.h
@@@ -42,14 -42,20 +42,20 @@@ typedef struct ipc_client 
   * message_type is the type of the message as the sender specified it.
   *
   */
 -typedef void(*handler_t)(int, uint8_t*, int, uint32_t, uint32_t);
 +typedef void (*handler_t)(int, uint8_t *, int, uint32_t, uint32_t);
  
  /* Macro to declare a callback */
 -#define IPC_HANDLER(name) \
 -        static void handle_ ## name (int fd, uint8_t *message, \
 -                                     int size, uint32_t message_size, \
 -                                     uint32_t message_type)
 +#define IPC_HANDLER(name)                                      \
 +    static void handle_##name(int fd, uint8_t *message,        \
 +                              int size, uint32_t message_size, \
 +                              uint32_t message_type)
  
+ /**
+  * Emulates mkdir -p (creates any missing folders)
+  *
+  */
+ bool mkdirp(const char *path);
+ 
  /**
   * Handler for activity on the listening socket, meaning that a new client
   * has just connected and we should accept() him. Sets up the event handler