merge with /dev/null as base, instead of punting O==empty case

diff --git a/daemon.c b/daemon.c
index 0c6182fb93fce6937ecb2634462f7f6b0a835662..c3f86410d4fe392a2ced76b09e6af8ba8af534d5 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -1,5 +1,3 @@
-#include "cache.h"
-#include "pkt-line.h"
 #include <signal.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
@@ -9,6 +7,8 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <syslog.h>
+#include "pkt-line.h"
+#include "cache.h"
 
 static int log_syslog;
 static int verbose;