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

src/core/pibase.h

@@ -97,7 +97,6 @@
 #ifdef WINDOWS
 #  include <windef.h>
 #  include <winbase.h>
-#  include <stdlib.h>
 #  include <malloc.h>
 #  ifdef CC_VC
 #    define SHUT_RDWR 2

src/core/piincludes.h

@@ -24,56 +24,18 @@
 #include "piflags.h"
 
 #include <iostream>
-#include <stdlib.h>
+//#include <stdlib.h>
 #include <cassert>
-#include <string.h>
-#include <string>
-#ifndef QNX
+//#include <string.h>
+//#include <string>
+/*#ifndef QNX
 #  include <cstdio>
 #  include <cstdlib>
 #else
 #  include <stdio.h>
-#endif
-/*#ifdef WINDOWS
-#  include <io.h>
-#  include <windows.h>
-#  include <wincon.h>
-#endif*/
-#ifdef CC_GCC
-#  include <unistd.h>
-#endif
-/*
-#include <sys/types.h>
-#include <cctype>
-#include <ctime>
-#include <csignal>
-#include <cmath>
-#include <typeinfo>
-#include <algorithm>
-#include <vector>
-#include <list>
-#include <queue>
-#include <deque>
-#include <stack>
-#include <set>
-#include <map>
-#ifdef WINDOWS
-#  include <conio.h>
-#  include <io.h>
-#  include <windows.h>
-#  include <wincon.h>
-#else
-#  include <fcntl.h>
-#  include <sys/ioctl.h>
-#  include <pthread.h>
-#endif
-#ifdef MAC_OS
-#  include <mach/mach_traps.h>
-#  include <mach/mach.h>
-#  include <mach/clock.h>
-#  include <crt_externs.h>
 #endif*/
 
+
 extern PIMonitor piMonitor;
 
 #ifndef QNX

src/io/piserial.cpp

@@ -786,7 +786,6 @@ PIStringList PISerial::availableDevices(bool test) {
 				--i;
 				continue;
 			}
-			int void_ = 0;
 			bool rok = true;
 #ifdef WINDOWS
 			/*COMMTIMEOUTS times;
@@ -799,6 +798,7 @@ PIStringList PISerial::availableDevices(bool test) {
 			if (ReadFile(hComm, &void_, 1, &readed_, 0) == 0)
 				rok = GetLastError() == ;*/
 #else
+			int void_ = 0;
 			fcntl(fd, F_SETFL, O_NONBLOCK);
 			if (::read(fd, &void_, 1) == -1)
 				rok = errno != EIO;

src/system/pisystemmonitor.cpp

@@ -140,8 +140,8 @@ void PISystemMonitor::run() {
 	stat.physical_memsize = stat.resident_memsize - stat.share_memsize;
 #else
 	stat.ID = pID_;
-	HMODULE hMod;
-	DWORD cbNeeded;
+//	HMODULE hMod;
+//	DWORD cbNeeded;
 	if (GetProcessMemoryInfo(hProc, &mem_cnt, sizeof(mem_cnt)) != 0) {
 		stat.physical_memsize = mem_cnt.WorkingSetSize;
 	}

src/thread/pithread.cpp

@@ -27,7 +27,9 @@
 #ifdef MAC_OS
 #  include <pthread.h>
 #endif
-
+#ifdef CC_GCC
+#  include <unistd.h>
+#endif
 
 /*! \class PIThread
  * \brief Thread class