[phreeqci] fixed header error with phast

This commit is contained in:
Scott R Charlton 2021-04-23 14:06:58 -06:00
parent 2d8ca2d0f3
commit d77c11ec70
6 changed files with 16 additions and 6 deletions

View File

@ -1,4 +1,3 @@
#include "Phreeqc.h"
#include "PHRQ_base.h" #include "PHRQ_base.h"
#include <iostream> #include <iostream>
#include "PHRQ_io.h" #include "PHRQ_io.h"

View File

@ -1,6 +1,15 @@
#ifndef INC_PHRQ_EXPORTS_H #ifndef INC_PHRQ_EXPORTS_H
#define INC_PHRQ_EXPORTS_H #define INC_PHRQ_EXPORTS_H
#if defined(WIN32)
# if defined(PHREEQCI_GUI)
# ifndef WINVER
# define WINVER 0x0400
# endif
# include <afx.h>
# endif
# include <windows.h>
#endif
#if defined(_WINDLL) && defined(IPhreeqc_EXPORTS) #if defined(_WINDLL) && defined(IPhreeqc_EXPORTS)
# define IPQ_DLL_EXPORT __declspec(dllexport) # define IPQ_DLL_EXPORT __declspec(dllexport)

View File

@ -1,5 +1,4 @@
#include <assert.h> #include <assert.h>
#include "Phreeqc.h"
#include "PHRQ_io.h" #include "PHRQ_io.h"
#include "Parser.h" #include "Parser.h"
@ -14,7 +13,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#if defined(PHREEQCI_GUI) #if defined(PHREEQCI_GUI)
#ifdef _DEBUG #ifdef _DEBUG
#define new DEBUG_NEW #define new DEBUG_NEW

View File

@ -15,7 +15,6 @@
#include "Parser.h" #include "Parser.h"
#include "PHRQ_io.h" #include "PHRQ_io.h"
#if defined(PHREEQCI_GUI) #if defined(PHREEQCI_GUI)
#ifdef _DEBUG #ifdef _DEBUG
#define new DEBUG_NEW #define new DEBUG_NEW

View File

@ -1,7 +1,13 @@
#if !defined(PARSER_H_INCLUDED) #if !defined(PARSER_H_INCLUDED)
#define PARSER_H_INCLUDED #define PARSER_H_INCLUDED
#if defined(WIN32) #if defined(WIN32)
#include <windows.h> # if defined(PHREEQCI_GUI)
# ifndef WINVER
# define WINVER 0x0400
# endif
# include <afx.h>
# endif
# include <windows.h>
#endif #endif
#include <string> // std::string #include <string> // std::string
#include <map> // std::map #include <map> // std::map

View File

@ -12,7 +12,6 @@
#include "float.h" #include "float.h"
#include "math.h" #include "math.h"
#if defined(PHREEQCI_GUI) #if defined(PHREEQCI_GUI)
#ifdef _DEBUG #ifdef _DEBUG
#define new DEBUG_NEW #define new DEBUG_NEW