Merge release-4-6 into master

[alexxy/gromacs.git] / src / tools / gmx_trjconv.c

diff --git a/src/tools/gmx_trjconv.c b/src/tools/gmx_trjconv.c
index b7c323358176282300963d4d5e367bc100bdd22a..7de477a1402bffd7839d05646894281d91a6c603 100644 (file)
--- a/src/tools/gmx_trjconv.c
+++ b/src/tools/gmx_trjconv.c
@@ -35,12 +35,10 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "gmx_header_config.h"
 
 #include <string.h>
 #include <math.h>
 #include "macros.h"
-#include "assert.h"
 #include "sysstuff.h"
 #include "smalloc.h"
 #include "typedefs.h"
@@ -65,6 +63,10 @@
 #include "gmx_ana.h"
 #include "gmx_sort.h"
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 enum { euSel,euRect, euTric, euCompact, euNR};