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

This commit is contained in:
2017-04-14 13:10:30 +00:00
parent e7f4498825
commit dd25e8852c
6 changed files with 14 additions and 7 deletions

View File

@@ -18,6 +18,9 @@
*/ */
#include "piterminal.h" #include "piterminal.h"
#ifdef CC_GCC
# include <unistd.h>
#endif
#ifdef WINDOWS #ifdef WINDOWS
# include "pisharedmemory.h" # include "pisharedmemory.h"
# include <windows.h> # include <windows.h>

View File

@@ -142,13 +142,9 @@
# ifdef MAC_OS # ifdef MAC_OS
# pragma GCC diagnostic ignored "-Wdeprecated-declarations" # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
# else # else
//# pragma GCC diagnostic ignored "-Wpragmas" //# pragma GCC diagnostic ignored "-Waggressive-loop-optimizations"
# pragma GCC diagnostic ignored "-Waggressive-loop-optimizations"
# endif # endif
//# pragma GCC diagnostic ignored "-Wformat"
//# pragma GCC diagnostic ignored "-Wformat-extra-args"
# pragma GCC diagnostic ignored "-Wstrict-aliasing" # pragma GCC diagnostic ignored "-Wstrict-aliasing"
//# pragma GCC diagnostic ignored "-Wsign-compare"
# endif # endif
# ifdef ANDROID # ifdef ANDROID
# pragma GCC diagnostic ignored "-Wunused-parameter" # pragma GCC diagnostic ignored "-Wunused-parameter"

View File

@@ -63,6 +63,9 @@
# endif # endif
#endif #endif
#include <errno.h> #include <errno.h>
#ifdef CC_GCC
# include <unistd.h>
#endif
/** \class PIEthernet /** \class PIEthernet

View File

@@ -21,6 +21,9 @@
#include "piconfig.h" #include "piconfig.h"
#include "pidir.h" #include "pidir.h"
#include <errno.h> #include <errno.h>
#ifdef CC_GCC
# include <unistd.h>
#endif
#ifdef WINDOWS #ifdef WINDOWS
# include <winreg.h> # include <winreg.h>
# define TIOCM_LE 1 # define TIOCM_LE 1

View File

@@ -32,6 +32,9 @@
# include <sys/stat.h> # include <sys/stat.h>
# include <sys/mman.h> # include <sys/mman.h>
#endif #endif
#ifdef CC_GCC
# include <unistd.h>
#endif
/*! \class PISharedMemory /*! \class PISharedMemory

View File

@@ -138,8 +138,7 @@ void PIProcess::startProc(bool detached) {
if (g_out) tf_out = freopen(f_out.path().data(), "w", stdout); if (g_out) tf_out = freopen(f_out.path().data(), "w", stdout);
if (g_err) tf_err = freopen(f_err.path().data(), "w", stderr); if (g_err) tf_err = freopen(f_err.path().data(), "w", stderr);
#ifndef WINDOWS #ifndef WINDOWS
int as2; if (!wd.isEmpty()) chdir(wd.data());
if (!wd.isEmpty()) as2 = chdir(wd.data());
#endif #endif
#ifdef WINDOWS #ifdef WINDOWS
GetStartupInfoA(&si); GetStartupInfoA(&si);