From 7f291d1c56070131ef8e5b665c58dfb953ec5ebd Mon Sep 17 00:00:00 2001
From: Darth Vader <darth@empire.com>
Date: Sat, 18 Nov 2023 03:55:04 +0000
Subject: [PATCH] Squashed 'src/' changes from a8a469b2..ba2ac191

ba2ac191 Merge commit '488c119ac8fb2c9755ce3708519c79f4bd7d382c'
488c119a Squashed 'phreeqcpp/' changes from f975e17..9925ceb

git-subtree-dir: src
git-subtree-split: ba2ac191650c3db3e396fd006e26c18587efdf09
---
 phreeqcpp/Phreeqc.h           | 3 +--
 phreeqcpp/global_structures.h | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/phreeqcpp/Phreeqc.h b/phreeqcpp/Phreeqc.h
index 01a49e45..5510379f 100644
--- a/phreeqcpp/Phreeqc.h
+++ b/phreeqcpp/Phreeqc.h
@@ -6,7 +6,6 @@
 #      define WINVER 0x0400
 #    endif
 #    include <afx.h>
-// #    define nullptr NULL
 #  endif
 #  include <windows.h>
 #  if defined(PHREEQCI_GUI)
@@ -2096,7 +2095,7 @@ char* _string_duplicate(const char* token, const char* szFileName, int nLine);
 // https://stackoverflow.com/questions/2915672/snprintf-and-visual-studio-2010
 
 #if defined(_MSC_VER) && (_MSC_VER < 1900)
-#if (_MSC_VER == 1400) // VS2005
+#if (_MSC_VER <= 1700) // VS2012
 namespace std {
 	__inline bool isnan(double num) {
 		return _isnan(num) != 0;
diff --git a/phreeqcpp/global_structures.h b/phreeqcpp/global_structures.h
index 020770f7..c4672cfe 100644
--- a/phreeqcpp/global_structures.h
+++ b/phreeqcpp/global_structures.h
@@ -6,7 +6,8 @@
  *   #define DEFINITIONS
  * ---------------------------------------------------------------------- */
 #if !defined(NAN)
-#  if defined(_MSC_VER) && (_MSC_VER <= 1400) // VS2005
+#  if defined(_MSC_VER) && (_MSC_VER <= 1700) // VS2012
+//   https://learn.microsoft.com/en-us/cpp/preprocessor/predefined-macros?view=msvc-170     
 #    include <limits>
 #    define NAN std::numeric_limits<double>::signaling_NaN()
 #  else