Selaa lähdekoodia

Haiku: some small fixes

Kostadin Damyanov 10 vuotta sitten
vanhempi
commit
a553327043

+ 2 - 3
drivers/unix/stream_peer_tcp_posix.cpp

@@ -206,11 +206,10 @@ Error StreamPeerTCPPosix::write(const uint8_t* p_data,int p_bytes, int &r_sent,
 
 	while (data_to_send) {
 
-		// TODO: haiku does not have MSG_NOSIGNAL
 #ifdef __HAIKU__
-	int sent_amount = send(sockfd, offset, data_to_send, 0);
+		int sent_amount = send(sockfd, offset, data_to_send, 0);
 #else
-	int sent_amount = send(sockfd, offset, data_to_send, MSG_NOSIGNAL);
+		int sent_amount = send(sockfd, offset, data_to_send, MSG_NOSIGNAL);
 #endif
 		//printf("Sent TCP data of %d bytes, errno %d\n", sent_amount, errno);
 

+ 4 - 0
platform/haiku/os_haiku.cpp

@@ -79,3 +79,7 @@ OS::VideoMode OS_Haiku::get_video_mode(int p_screen) const {
 void OS_Haiku::get_fullscreen_mode_list(List<VideoMode> *p_list, int p_screen) const {
 	
 }
+
+String OS_Haiku::get_executable_path() const {
+	return OS::get_executable_path();
+}

+ 1 - 1
platform/haiku/os_haiku.h

@@ -1,7 +1,6 @@
 #ifndef OS_HAIKU_H
 #define OS_HAIKU_H
 
-#include "os/os.h"
 #include "drivers/unix/os_unix.h"
 
 
@@ -38,6 +37,7 @@ public:
 	virtual void set_video_mode(const VideoMode& p_video_mode, int p_screen=0);
 	virtual VideoMode get_video_mode(int p_screen=0) const;
 	virtual void get_fullscreen_mode_list(List<VideoMode> *p_list, int p_screen=0) const;
+	virtual String get_executable_path() const;
 };
 
 #endif