Rename "round" to "myround". Otherwise, the function "round" has the

same name as the one from <math.h> (which is #included) but has a
different return type, which is an error for gcc 4.0.


git-svn-id: http://svn.cactuscode.org/flesh/trunk@3944 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 3 insertions, 4 deletions

diff --git a/src/util/Misc.c b/src/util/Misc.c
index e08285b9..2b351fc1 100644
--- a/src/util/Misc.c
+++ b/src/util/Misc.c
@@ -457,7 +457,7 @@ int Util_IntInRange(int inval, const char *range)
 
     if(inval >= start + !start_closed &&
        inval <= end   - !end_closed   &&
-       ! ((inval-start) % step))
+       ! (((unsigned int)inval - (unsigned int)start) % step))
     {
       retval = 1;
     }
@@ -1221,10 +1221,9 @@ void CCTK_FCALL CCTK_FNAME(CCTK_PrintString)
 @@*/
 int CCTK_FortranString (const char *c_string,
                         char *fortran_string,
-                        size_t fortran_length)
+                        int fortran_length)
 {
-  int nchars;
-  size_t c_strlen;
+  int nchars, c_strlen;
 
 
   nchars = c_strlen = strlen (c_string);