Removed phreeqcpp/ from include statement.

Added ifdef for PHREEQC_PARALLEL

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10557 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2015-12-09 16:50:33 +00:00
parent e994f78e39
commit 258f1064aa
2 changed files with 2 additions and 3 deletions

View File

@ -1,7 +1,6 @@
#include <memory> // auto_ptr
#include <map>
#include <string.h>
#include "IPhreeqc.hpp" // IPhreeqc
#include "Phreeqc.h" // Phreeqc
#include "thread.h"
@ -10,7 +9,7 @@
#include "Debug.h" // ASSERT
#include "ErrorReporter.hxx" // CErrorReporter
#include "CSelectedOutput.hxx" // CSelectedOutput
#include "phreeqcpp/SelectedOutput.h" // SelectedOutput
#include "SelectedOutput.h" // SelectedOutput
#include "dumper.h" // dumper
// statics

View File

@ -49,7 +49,7 @@
#endif
#ifndef _INC_PHREEQC_H
#if !defined (_INC_PHREEQC_H) || defined (PHREEQC_PARALLEL)
mutex_t map_lock = MUTEX_INITIALIZER;
mutex_t qsort_lock = MUTEX_INITIALIZER;
#else