max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 00:28:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'issue-2' into 'master'

Browse Source 
Issue 2

See merge request coupled/IPhreeqc!7
This commit is contained in:
Scott R Charlton 2019-01-30 17:12:46 -07:00
commit fbde6453ae
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IPhreeqcLib.cpp
View File

@ -781,6 +781,7 @@ SetBasicCallback(int id, double (*fcn)(double x1, double x2, const char *str, vo
}
return IPQ_BADINSTANCE;
}
#if !defined(R_SO)
#ifdef IPHREEQC_NO_FORTRAN_MODULE
IPQ_RESULT
SetBasicFortranCallback(int id, double (*fcn)(double *x1, double *x2, char *str, size_t l))
@ -805,7 +806,8 @@ SetBasicFortranCallback(int id, double (*fcn)(double *x1, double *x2, const char
}
return IPQ_BADINSTANCE;
}
#endif
#endif /* IPHREEQC_NO_FORTRAN_MODULE */
#endif /* !defined(R_SO) */
IPQ_RESULT
SetCurrentSelectedOutputUserNumber(int id, int n)
{

1
Version.h
View File

@ -3,6 +3,7 @@
#define VER_MINOR 0
#define VER_PATCH 0
#define VER_REVISION 0
#define GIT_COMMIT 0000000000000000000000000000000000000000
#define RELEASE_DATE "@RELEASE_DATE@"