Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / gmxlib / viewit.c

diff --git a/src/gromacs/gmxlib/viewit.c b/src/gromacs/gmxlib/viewit.c
index 0384bc921f0253c2a7305258879b27bcc5669f23..794dc8c63387efde491146825349276c05b57c16 100644 (file)
--- a/src/gromacs/gmxlib/viewit.c
+++ b/src/gromacs/gmxlib/viewit.c
@@ -35,18 +35,20 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "viewit.h"
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
+#include <stdlib.h>
 #include <string.h>
 
 #include "oenv.h"
-#include "viewit.h"
-#include "gromacs/utility/cstringutil.h"
-#include "gromacs/fileio/filenm.h"
 #include "macros.h"
-#include "gmx_fatal.h"
+#include "gromacs/fileio/filenm.h"
+#include "gromacs/utility/cstringutil.h"
+#include "gromacs/utility/fatalerror.h"
 
 static const int   can_view_ftp[] = {
     0,
@@ -58,7 +60,7 @@ static const char* view_program[] = {
     "ghostview",    "display",      NULL,           "xterm -e rasmol"
 };
 
-int can_view(int ftp)
+static int can_view(int ftp)
 {
     int i;