From 4c7946afb5029a3b68e91343792194cecb0c2a38 Mon Sep 17 00:00:00 2001 From: Scott R Charlton Date: Mon, 28 Jan 2019 16:41:11 -0700 Subject: [PATCH] Added code to record git commit hash --- IPhreeqcLib.cpp | 4 +++- Version.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/IPhreeqcLib.cpp b/IPhreeqcLib.cpp index df489636..2cd59d89 100644 --- a/IPhreeqcLib.cpp +++ b/IPhreeqcLib.cpp @@ -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) { diff --git a/Version.h b/Version.h index 562e2f53..94c88663 100644 --- a/Version.h +++ b/Version.h @@ -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@"