From dd25e8852c6e34608b5641e1bb5b72ca1d69019c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Fri, 14 Apr 2017 13:10:30 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@359 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src/console/piterminal.cpp | 3 +++ src/core/pibase.h | 6 +----- src/io/piethernet.cpp | 3 +++ src/io/piserial.cpp | 3 +++ src/io/pisharedmemory.cpp | 3 +++ src/system/piprocess.cpp | 3 +-- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/console/piterminal.cpp b/src/console/piterminal.cpp index 95136b26..219ccb54 100644 --- a/src/console/piterminal.cpp +++ b/src/console/piterminal.cpp @@ -18,6 +18,9 @@ */ #include "piterminal.h" +#ifdef CC_GCC +# include +#endif #ifdef WINDOWS # include "pisharedmemory.h" # include diff --git a/src/core/pibase.h b/src/core/pibase.h index ee0b5d49..1b07e818 100644 --- a/src/core/pibase.h +++ b/src/core/pibase.h @@ -142,13 +142,9 @@ # ifdef MAC_OS # pragma GCC diagnostic ignored "-Wdeprecated-declarations" # else -//# pragma GCC diagnostic ignored "-Wpragmas" -# pragma GCC diagnostic ignored "-Waggressive-loop-optimizations" +//# pragma GCC diagnostic ignored "-Waggressive-loop-optimizations" # endif -//# pragma GCC diagnostic ignored "-Wformat" -//# pragma GCC diagnostic ignored "-Wformat-extra-args" # pragma GCC diagnostic ignored "-Wstrict-aliasing" -//# pragma GCC diagnostic ignored "-Wsign-compare" # endif # ifdef ANDROID # pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/io/piethernet.cpp b/src/io/piethernet.cpp index b7a0c4ef..6ccafe5c 100755 --- a/src/io/piethernet.cpp +++ b/src/io/piethernet.cpp @@ -63,6 +63,9 @@ # endif #endif #include +#ifdef CC_GCC +# include +#endif /** \class PIEthernet diff --git a/src/io/piserial.cpp b/src/io/piserial.cpp index 0c85e020..61ece534 100755 --- a/src/io/piserial.cpp +++ b/src/io/piserial.cpp @@ -21,6 +21,9 @@ #include "piconfig.h" #include "pidir.h" #include +#ifdef CC_GCC +# include +#endif #ifdef WINDOWS # include # define TIOCM_LE 1 diff --git a/src/io/pisharedmemory.cpp b/src/io/pisharedmemory.cpp index c0971185..5b36dca8 100644 --- a/src/io/pisharedmemory.cpp +++ b/src/io/pisharedmemory.cpp @@ -32,6 +32,9 @@ # include # include #endif +#ifdef CC_GCC +# include +#endif /*! \class PISharedMemory diff --git a/src/system/piprocess.cpp b/src/system/piprocess.cpp index 9f3baef7..d444e371 100755 --- a/src/system/piprocess.cpp +++ b/src/system/piprocess.cpp @@ -138,8 +138,7 @@ void PIProcess::startProc(bool detached) { if (g_out) tf_out = freopen(f_out.path().data(), "w", stdout); if (g_err) tf_err = freopen(f_err.path().data(), "w", stderr); #ifndef WINDOWS - int as2; - if (!wd.isEmpty()) as2 = chdir(wd.data()); + if (!wd.isEmpty()) chdir(wd.data()); #endif #ifdef WINDOWS GetStartupInfoA(&si);