X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=server.cpp;h=dfd5b97dffb4e67c38c8a585df77269686e873a1;hb=488f28bf7070f44469a006ed4a9d4c423788d175;hp=64819f447ffeec0fbf6de8187e2de1d7705c240c;hpb=c271559c8b2b9583346c8c6269701894cb9ff4c1;p=cubemap

diff --git a/server.cpp b/server.cpp
index 64819f4..dfd5b97 100644
--- a/server.cpp
+++ b/server.cpp
@@ -1,29 +1,26 @@
-#include <stdio.h>
-#include <string.h>
-#include <stdint.h>
-#include <unistd.h>
 #include <assert.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
+#include <errno.h>
 #include <pthread.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <sys/epoll.h>
 #include <sys/sendfile.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 #include <time.h>
-#include <signal.h>
-#include <errno.h>
-#include <vector>
-#include <string>
-#include <map>
+#include <unistd.h>
 #include <algorithm>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "markpool.h"
+#include "mutexlock.h"
 #include "parse.h"
 #include "server.h"
-#include "stream.h"
-#include "mutexlock.h"
 #include "state.pb.h"
+#include "stream.h"
 
 using namespace std;