Sort all includes in src/gromacs

[alexxy/gromacs.git] / src / gromacs / utility / smalloc.c

diff --git a/src/gromacs/utility/smalloc.c b/src/gromacs/utility/smalloc.c
index 6b45a99a82be08246483cfa8eb7035a6d6cfbf4a..16d70514b98267a527a371af3c59872c99e52017 100644 (file)
--- a/src/gromacs/utility/smalloc.c
+++ b/src/gromacs/utility/smalloc.c
@@ -36,7 +36,7 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/utility/smalloc.h"
+#include "smalloc.h"
 
 #include "config.h"
 
@@ -48,6 +48,9 @@
 #ifdef WITH_DMALLOC
 #include <dmalloc.h>
 #endif
+#ifdef HAVE__ALIGNED_MALLOC
+#include <malloc.h>
+#endif
 
 #include "thread_mpi/threads.h"
 
@@ -337,7 +340,7 @@ void *save_calloc_aligned(const char *name, const char *file, int line,
 }
 
 /* This routine can NOT be called with any pointer */
-void save_free_aligned(const char *name, const char *file, int line, void *ptr)
+void save_free_aligned(const char gmx_unused *name, const char gmx_unused *file, int gmx_unused line, void *ptr)
 {
     int   i, j;
     void *free = ptr;