IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-11-22 08:46:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Using the preprocessor macor Q_OS_WIN differently, it was failing to

Browse Source 
compile the runtime on windows with C1017 error.
This commit is contained in:
Ashesh Vashi 2016-06-21 15:45:08 +05:30
parent a35288e25d
commit 061a9d9322
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/Server.cpp
View File

@ -90,7 +90,7 @@ Server::Server(quint16 port)
add_to_path(python_path, venvLibPath.canonicalFilePath()); add_to_path(python_path, venvLibPath.canonicalFilePath());
add_to_path(python_path, venvDynLibPath.canonicalFilePath()); add_to_path(python_path, venvDynLibPath.canonicalFilePath());
add_to_path(python_path, venvSitePackagesPath.canonicalFilePath()); add_to_path(python_path, venvSitePackagesPath.canonicalFilePath());
#elif Q_OS_WIN #elif defined(Q_OS_WIN)
// In the case we're running in a release application, we need to ensure the // In the case we're running in a release application, we need to ensure the
// bundled virtual env is included in the Python path. We include it at the // bundled virtual env is included in the Python path. We include it at the
@ -137,7 +137,7 @@ Server::Server(quint16 port)
python_path.append(path_list.at(i)); python_path.append(path_list.at(i));
if (i > 0) if (i > 0)
{ {
#if Q_OS_WIN #if defined(Q_OS_WIN)
python_path.append(";"); python_path.append(";");
#else #else
python_path.append(":"); python_path.append(":");