Fixed compilation of these resolved conflicts as well now.

diff --git a/include/string2.h b/include/string2.h
index 5077c3409b7ef3516dbf6b5f7f45508b78eff4a2..61ba9ee615602c1c659cfca156f917bb56953c9a 100644 (file)
--- a/include/string2.h
+++ b/include/string2.h
@@ -118,7 +118,7 @@ char *wrap_lines(const char *buf,int line_width, int indent,
  */
 
 
-char **split(char sep,char *str);
+char **split(char sep,const char *str);
 /* Implementation of the well-known Perl function split */
 
 gmx_large_int_t str_to_large_int_t(const char *str, char **endptr);

diff --git a/include/vec.h b/include/vec.h
index 19f2fd1618a5a94af4bec037014baad70dbd0237..a2b0c099d4a5600b8799da325b467556048d8016 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);

diff --git a/src/kernel/pdb2top.c b/src/kernel/pdb2top.c
index 50512571037d36c33a638b965954a0c0be31b660..52a3e6f94ca833176ce429d9cc2ec8f27eab50bc 100644 (file)
--- a/src/kernel/pdb2top.c
+++ b/src/kernel/pdb2top.c
@@ -233,7 +233,6 @@ choose_ff(const char *ffsel,
                 }
             }
         }
-        */
 
         printf("\nSelect the Force Field:\n");
         for(i=0; (i<nff); i++)