Merge branch 'rotation-4-5' into rotation

[alexxy/gromacs.git] / include / vec.h

diff --git a/include/vec.h b/include/vec.h
index 139a9c4514f339210ce8be0b2edd756f960f0284..10d221c259afa7a8c11de1020cbe6a07a01c7ce3 100644 (file)
--- a/include/vec.h
+++ b/include/vec.h
@@ -828,7 +828,7 @@ static gmx_inline real trace(matrix m)
   return (m[XX][XX]+m[YY][YY]+m[ZZ][ZZ]);
 }
 
-static gmx_inline real _divide(real a,real b,const char *file,int line)
+static gmx_inline real _divide_err(real a,real b,const char *file,int line)
 {
     if (fabs(b) <= GMX_REAL_MIN) 
         gmx_fatal(FARGS,"Dividing by zero, file %s, line %d",file,line);
@@ -866,7 +866,7 @@ static void matrix_convert(matrix box, rvec vec, rvec angle)
                        -box[ZZ][XX]*box[ZZ][XX]-box[ZZ][YY]*box[ZZ][YY]);
 }
 
-#define divide(a,b) _divide((a),(b),__FILE__,__LINE__)
+#define divide_err(a,b) _divide_err((a),(b),__FILE__,__LINE__)
 #define mod(a,b)    _mod((a),(b),__FILE__,__LINE__)
 
 #ifdef __cplusplus