Merge pull request #20 from benklett/time

Revert "Merge pull request #19 from asgeirom/master"
2014-01-05 21:58:20 -08:00 · 2014-01-05 21:58:20 -08:00 · 121f4a3ae9
parent e9d1d66b8a ab1d4588e2
commit 121f4a3ae9
1 changed files with 0 additions and 3 deletions
--- a/libobs/util/platform-nix.c
+++ b/libobs/util/platform-nix.c
@ -21,9 +21,6 @@
 #include <dlfcn.h>
 #include <unistd.h>
 #include <time.h>
-#if defined(__linux) || defined(__linux__) || defined(linux)
-#include <linux/time.h>
-#endif

 #include "dstr.h"
 #include "platform.h"