Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / gmxpreprocess / hackblock.c

diff --git a/src/gromacs/gmxpreprocess/hackblock.c b/src/gromacs/gmxpreprocess/hackblock.c
index a5cdc7a0afd71dfef7304f7c44add61506eb9635..c7919872c1786e63e063223499e88cc63bc7b08f 100644 (file)
--- a/src/gromacs/gmxpreprocess/hackblock.c
+++ b/src/gromacs/gmxpreprocess/hackblock.c
@@ -42,8 +42,7 @@
 #include <string.h>
 #include "hackblock.h"
 #include "gromacs/utility/smalloc.h"
-#include "vec.h"
-#include "macros.h"
+#include "gromacs/math/vec.h"
 
 /* these MUST correspond to the enum in hackblock.h */
 const char *btsNames[ebtsNR] = { "bonds", "angles", "dihedrals", "impropers", "exclusions", "cmap" };
@@ -93,7 +92,7 @@ void free_t_restp(int nrtp, t_restp **rtp)
             free_t_bondeds(&(*rtp)[i].rb[j]);
         }
     }
-    free(*rtp);
+    sfree(*rtp);
 }
 
 void free_t_hack(int nh, t_hack **h)