Merge release-4-6 into master

[alexxy/gromacs.git] / src / programs / grompp / grompp.c

diff --git a/src/programs/grompp/grompp.c b/src/programs/grompp/grompp.c
index 1be9796a3c2c24f5a4b4f895cbccd0a877b12e2e..a14c52231a7451208404f77473b4793f6af47a7a 100644 (file)
--- a/src/programs/grompp/grompp.c
+++ b/src/programs/grompp/grompp.c
@@ -1217,7 +1217,7 @@ static void set_verlet_buffer(const gmx_mtop_t *mtop,
     }
 }
 
-int main (int argc, char *argv[])
+int cmain (int argc, char *argv[])
 {
   static const char *desc[] = {
     "The gromacs preprocessor",