Skip to content

Commit

Permalink
Squashed 'src/' changes from f975e17c..9925ceb3
Browse files Browse the repository at this point in the history
9925ceb3 Updated for more visual studios tested on vs2005 vs2012 vs2013 vs2015 vs2019

git-subtree-dir: src
git-subtree-split: 9925ceb3d2afa5ed8686dbc781b857e6f1b45314
  • Loading branch information
Darth Vader committed Nov 18, 2023
1 parent 4496cb9 commit bd4105b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
3 changes: 1 addition & 2 deletions Phreeqc.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
# define WINVER 0x0400
# endif
# include <afx.h>
// # define nullptr NULL
# endif
# include <windows.h>
# if defined(PHREEQCI_GUI)
Expand Down Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion global_structures.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit bd4105b

Please # to comment.