summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBert Münnich <ber.t@posteo.de>2017-05-17 20:15:35 +0200
committerBert Münnich <ber.t@posteo.de>2017-05-17 20:15:35 +0200
commitde3d7827ce13a52b1bcf3b72e9dc2ee89152dea6 (patch)
tree8cd3cba41c59fa2a926b97f65a97e66f25f48363
parent0e1a85d22485e2aac1b9930d1e3e0897a2076db3 (diff)
downloadnsxiv-de3d7827ce13a52b1bcf3b72e9dc2ee89152dea6.tar.zst
Compiler independent buffer alignment
-rw-r--r--autoreload_inotify.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/autoreload_inotify.c b/autoreload_inotify.c
index a7378f6..473b8cb 100644
--- a/autoreload_inotify.c
+++ b/autoreload_inotify.c
@@ -56,22 +56,26 @@ static void arl_setup_dir(arl_t *arl, const char *filepath)
free(dntmp);
}
+union {
+ char d[4096]; /* aligned buffer */
+ struct inotify_event e;
+} buf;
+
bool arl_handle(arl_t *arl, const char *filepath)
{
bool reload = false;
- char buf[4096] __attribute__ ((aligned(__alignof__(struct inotify_event))));
char *ptr;
const struct inotify_event *event;
for (;;) {
- ssize_t len = read(arl->fd, buf, sizeof(buf));
+ ssize_t len = read(arl->fd, buf.d, sizeof(buf.d));
if (len == -1) {
if (errno == EINTR)
continue;
break;
}
- for (ptr = buf; ptr < buf + len; ptr += sizeof(*event) + event->len) {
+ for (ptr = buf.d; ptr < buf.d + len; ptr += sizeof(*event) + event->len) {
event = (const struct inotify_event*) ptr;
/* events from watching the file itself */