From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sat, 13 Apr 2013 20:53:23 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.sesse.net/srv/git.sesse.net/www/cubemap
X-Git-Tag: 1.0.0~118
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=93bcb482a3f433504aa794441ea4a69aede345ff;hp=f2a5ca1fe4798ebd87d16550198118e2172243f4;p=cubemap

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

diff --git a/input.cpp b/input.cpp
index d7c2b77..7c776e1 100644
--- a/input.cpp
+++ b/input.cpp
@@ -1,5 +1,4 @@
 #include <stddef.h>
-#include <string.h>
 #include <string>
 
 #include "httpinput.h"
diff --git a/parse.cpp b/parse.cpp
index f77af4a..c14b47f 100644
--- a/parse.cpp
+++ b/parse.cpp
@@ -1,5 +1,4 @@
 #include <ctype.h>
-#include <stdio.h>
 #include <string.h>
 #include <string>
 #include <vector>
diff --git a/server.cpp b/server.cpp
index 2c8661a..0cbc453 100644
--- a/server.cpp
+++ b/server.cpp
@@ -7,7 +7,6 @@
 #include <sys/sendfile.h>
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <time.h>
 #include <unistd.h>
 #include <algorithm>
 #include <map>
diff --git a/stream.h b/stream.h
index 7fabd19..a4aa642 100644
--- a/stream.h
+++ b/stream.h
@@ -6,6 +6,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+#include <sys/types.h>
 #include <string>
 #include <vector>