Merge release-4-6 into master

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

diff --git a/src/tools/gmx_bar.c b/src/tools/gmx_bar.c
index d6df8fa8457caf60e6cb8fd4f4acc034eff165a5..bebdcb37f273d6cefc69acd3330551d7e9e2f4db 100644 (file)
--- a/src/tools/gmx_bar.c
+++ b/src/tools/gmx_bar.c
@@ -36,7 +36,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "gmx_header_config.h"
+
 #include <math.h>
 #include <string.h>
 #include <ctype.h>
@@ -56,12 +56,7 @@
 #include "xvgr.h"
 #include "gmx_ana.h"
 #include "maths.h"
-
-/* Suppress Cygwin compiler warnings from using newlib version of
- * ctype.h */
-#ifdef GMX_CYGWIN
-#undef isdigit
-#endif
+#include "string2.h"
 
 /* the dhdl.xvg data from a simulation (actually obsolete, but still
     here for reading the dhdl.xvg file*/