X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fos_unix.cpp;h=b85bdb20cd4788ec8dfbeeb762983db100404c52;hb=19024f725533b3dcdeddc318119e1379eb2c6837;hp=b8a94b2c5680e8a194be628bad162afd56df8d3b;hpb=1717ef203cf08fd393e2b905a9ed7f9465c8f47d;p=lyx.git

diff --git a/src/support/os_unix.cpp b/src/support/os_unix.cpp
index b8a94b2c56..b85bdb20cd 100644
--- a/src/support/os_unix.cpp
+++ b/src/support/os_unix.cpp
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 
 #ifdef __APPLE__
-#include <Carbon/Carbon.h>
+#include <CoreServices/CoreServices.h>
 #endif
 
 using namespace std;
@@ -51,7 +51,7 @@ void init(int argc, char * argv[])
 
 string utf8_argv(int i)
 {
-	LASSERT(i < argc_, /**/);
+	LASSERT(i < argc_, return "");
 	return to_utf8(from_local8bit(argv_[i]));
 }
 
@@ -222,12 +222,6 @@ shell_type shell()
 }
 
 
-int timeout_min()
-{
-	return 3;
-}
-
-
 char path_separator(path_type)
 {
 	return ':';