From 0feb71507f3a246e8021a2c4781ab6c814c73e71 Mon Sep 17 00:00:00 2001 From: Scott R Charlton Date: Thu, 22 Apr 2021 14:11:23 -0600 Subject: [PATCH] [phreeqci] fixed WINDOWS.H already included error on windows builds --- ChartHandler.cpp | 2 +- ChartObject.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChartHandler.cpp b/ChartHandler.cpp index d3e4e900..b1a75cc2 100644 --- a/ChartHandler.cpp +++ b/ChartHandler.cpp @@ -2,11 +2,11 @@ // ////////////////////////////////////////////////////////////////////// #if defined MULTICHART +#include "Phreeqc.h" #ifdef _DEBUG #pragma warning(disable : 4786) // disable truncation warning (Only used by debugger) #endif #include "ChartHandler.h" -#include "phreeqc.h" #include diff --git a/ChartObject.cpp b/ChartObject.cpp index dc0c79f3..9e24884d 100644 --- a/ChartObject.cpp +++ b/ChartObject.cpp @@ -2,6 +2,7 @@ // ////////////////////////////////////////////////////////////////////// #ifdef MULTICHART +#include "Phreeqc.h" #ifdef _DEBUG #pragma warning(disable : 4786) // disable truncation warning (Only used by debugger) #endif @@ -12,7 +13,6 @@ #include #include #include -#include "Phreeqc.h" #include "phqalloc.h" #include "Form1.h"