Merge branch 'master' of /srv/git.sesse.net/www/cubemap

diff --git a/accesslog.cpp b/accesslog.cpp
index 410b3b6e1b92b655530f2de415653916ddde54f0..6c4d3672c5dded007386f6aa2483a374a6127b05 100644 (file)
--- a/accesslog.cpp
+++ b/accesslog.cpp
@@ -1,9 +1,6 @@
-#include <errno.h>
-#include <poll.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <time.h>
-#include <unistd.h>
 #include <string>
 #include <vector>
 

diff --git a/httpinput.cpp b/httpinput.cpp
index e54aedba2f593711c08af8b9f614adf0fddfdc1c..e113c5717a76ac27ae6f1a52ae30c93a1b29e747 100644 (file)
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -1,4 +1,3 @@
-#include <stdio.h>
 #include <assert.h>
 #include <errno.h>
 #include <netdb.h>
@@ -9,6 +8,7 @@
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
+#include <time.h>
 #include <unistd.h>
 #include <map>
 #include <string>

diff --git a/serverpool.cpp b/serverpool.cpp
index f8e64aaeb962e75b139e3cc3e9098161abda6990..590e0f53b30a5c095e3b57a7a1a5a470093574fb 100644 (file)
--- a/serverpool.cpp
+++ b/serverpool.cpp
@@ -1,11 +1,7 @@
 #include <assert.h>
-#include <errno.h>
-#include <google/protobuf/repeated_field.h>
 #include <stdlib.h>
-#include <unistd.h>
 
 #include "client.h"
-#include "log.h"
 #include "server.h"
 #include "serverpool.h"
 #include "state.pb.h"

diff --git a/stats.cpp b/stats.cpp
index 6dffa5822290b72857c516b325ef0dd105de988f..9e3f72c2d065613c2a783336c9980c05785eea22 100644 (file)
--- a/stats.cpp
+++ b/stats.cpp
@@ -1,6 +1,4 @@
-#include <errno.h>
 #include <fcntl.h>
-#include <poll.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/stream.cpp b/stream.cpp
index b8604012f628fcce938e5861908af82436e1e0d6..6a8402794312ad4a4985da3478bddeffcafa5625 100644 (file)
--- a/stream.cpp
+++ b/stream.cpp
@@ -3,7 +3,7 @@
 #include <netinet/in.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
+#include <sys/types.h>
 #include <string>
 #include <vector>
 

diff --git a/thread.cpp b/thread.cpp
index 98c743c594313704281c2360f2d5688c0c691cab..72bc320b0b32359dcbbe51352b2df8ca77850a45 100644 (file)
--- a/thread.cpp
+++ b/thread.cpp
@@ -1,6 +1,5 @@
 #include <assert.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <poll.h>
 #include <signal.h>
 #include <stdio.h>

diff --git a/udpinput.cpp b/udpinput.cpp
index db544857bf367e0cfb0923c4de7343496d01facd..887850c91355d17b50d1f2f07a50be5bdd91c72c 100644 (file)
--- a/udpinput.cpp
+++ b/udpinput.cpp
@@ -1,6 +1,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <poll.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/socket.h>

diff --git a/util.cpp b/util.cpp
index 2bbffdc13c1aeafe0224014060b23043eca47fb1..1b76962a2b1e5061209da30acfaff172a8d4e981 100644 (file)
--- a/util.cpp
+++ b/util.cpp
@@ -2,9 +2,8 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <sys/stat.h>
-#include <sys/types.h>
+#include <unistd.h>
 
 #include "log.h"
 #include "util.h"