git-svn-id: svn://db.shs.com.ru/pip@263 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

src/console/piterminal.cpp

@@ -25,9 +25,13 @@
 #else
 #  include "piprocess.h"
 #  include <csignal>
-#  include <pty.h>
 #  include <fcntl.h>
 #  include <sys/ioctl.h>
+#  if defined(QNX) || defined(BLACKBERRY)
+#    include <unix.h>
+#  else
+#    include <pty.h>
+#  endif
 #endif
 
 
@@ -75,7 +79,6 @@ PRIVATE_DEFINITION_START(PITerminal)
 	bool is_esc_seq, last_read;
 	PIMap<int, bool> DEC;
 	PIVector<PIVector<PIScreenTypes::Cell> > cells_save;
-	termios desc;
 #endif
 PRIVATE_DEFINITION_END(PITerminal)
 

src/math/pimathbase.h

@@ -36,7 +36,7 @@
 #  ifdef BLACKBERRY
 #    include <complex>
 #  else
-#    include <complex.h>
+#    include <complex>
 #  endif
 #else
 #  include <complex>

src/thread/pithread.cpp

@@ -137,7 +137,7 @@ bool PIThread::start(int timer_delay) {
 	pthread_attr_destroy(&attr);
 	if (ret == 0) {
 #  ifdef MAC_OS
-		pthread_threadid_np(thread, (__uint64_t*)&tid)
+		pthread_threadid_np(thread, (__uint64_t*)&tid_)
 #  else
 		tid_ = thread;
 #  endif
@@ -173,7 +173,7 @@ bool PIThread::startOnce() {
 	pthread_attr_destroy(&attr);
 	if (ret == 0) {
 #  ifdef MAC_OS
-		pthread_threadid_np(thread, (__uint64_t*)&tid)
+		pthread_threadid_np(thread, (__uint64_t*)&tid_)
 #  else
 		tid_ = thread;
 #  endif