Merge release-4-6 into master

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

diff --git a/src/programs/tpbconv/tpbconv.c b/src/programs/tpbconv/tpbconv.c
index 8a1fb590e7ac274c6370a2084f96511595d1bb48..3ad06a03c068f9c89988fea350736d852e2ce8ad 100644 (file)
--- a/src/programs/tpbconv/tpbconv.c
+++ b/src/programs/tpbconv/tpbconv.c
@@ -291,7 +291,7 @@ static void zeroq(int n,atom_id index[],gmx_mtop_t *mtop)
   }
 }
 
-int main (int argc, char *argv[])
+int cmain (int argc, char *argv[])
 {
   const char *desc[] = {
     "tpbconv can edit run input files in four ways.[PAR]",