Merge release-4-6 into master

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

diff --git a/src/tools/gmx_make_edi.c b/src/tools/gmx_make_edi.c
index 3142dc16de5a6f0aba1f2619953c4d9b18967da0..3e1c71df6d416dafbac448b8578c512613b0009a 100644 (file)
--- a/src/tools/gmx_make_edi.c
+++ b/src/tools/gmx_make_edi.c
@@ -34,7 +34,6 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "gmx_header_config.h"
 
 #include <math.h>
 #include <stdlib.h>
@@ -63,12 +62,7 @@
 #include "txtdump.h"
 #include "eigio.h"
 #include "index.h"
-
-/* Suppress Cygwin compiler warnings from using newlib version of
- * ctype.h */
-#ifdef GMX_CYGWIN
-#undef isdigit
-#endif
+#include "string2.h"
 
 typedef struct
 {