From 21b38a9779077f3de5ccea500358d03c880df8cd Mon Sep 17 00:00:00 2001
From: David L Parkhurst <dlpark@usgs.gov>
Date: Fri, 13 Mar 2015 18:34:10 +0000
Subject: [PATCH] removed FC_FUNC from IPhreeqc_interface_F.h, fixed padfstring
 to use int sofar

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9357 1feff8c3-07ed-0310-ac33-dd36852eb9cd
---
 src/IPhreeqc_interface_F.cpp | 4 ++--
 src/IPhreeqc_interface_F.h   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/IPhreeqc_interface_F.cpp b/src/IPhreeqc_interface_F.cpp
index 2bca195a..1d967c07 100644
--- a/src/IPhreeqc_interface_F.cpp
+++ b/src/IPhreeqc_interface_F.cpp
@@ -28,7 +28,7 @@ f2cstring(char* fstring, size_t len)
 void
 padfstring(char *dest, const char *src, int* len)
 {
-    size_t sofar;
+    int sofar;
 
     for (sofar = 0; (sofar < *len) && (*src != '\0'); ++sofar)
         *dest++ = *src++;
@@ -509,4 +509,4 @@ SetSelectedOutputStringOnF(int *id, int* selected_output_string_on)
 {
 	return ::SetSelectedOutputStringOn(*id, *selected_output_string_on);
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/IPhreeqc_interface_F.h b/src/IPhreeqc_interface_F.h
index 3314463d..075312fb 100644
--- a/src/IPhreeqc_interface_F.h
+++ b/src/IPhreeqc_interface_F.h
@@ -7,6 +7,7 @@
 #define IPQ_DLL_EXPORT
 #endif
 
+#ifdef SKIP
 #if defined(FC_FUNC)
 #define AccumulateLineF                     FC_FUNC (accumulatelinef,                     ACCUMULATELINEF)
 #define AddErrorF                           FC_FUNC (adderrorf,                           ADDERRORF)
@@ -76,6 +77,7 @@
 #define SetSelectedOutputFileOnF            FC_FUNC (setselectedoutputfileonf,            SETSELECTEDOUTPUTFILEONF)
 #define SetSelectedOutputStringOnF          FC_FUNC (setselectedoutputstringonf,          SETSELECTEDOUTPUTSTRINGONF)
 #endif /* FC_FUNC */
+#endif
 
 #if defined(__cplusplus)
 extern "C" {