Sort all includes in src/gromacs

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

diff --git a/src/gromacs/gmxpreprocess/hackblock.h b/src/gromacs/gmxpreprocess/hackblock.h
index bc763b6d73937dd7bcbafdad04566854573977fc..294dcec86c486006856beeae573b874907c00fb9 100644 (file)
--- a/src/gromacs/gmxpreprocess/hackblock.h
+++ b/src/gromacs/gmxpreprocess/hackblock.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2013, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -35,13 +35,14 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
-#ifndef _hackblock_h
-#define _hackblock_h
+#ifndef GMX_GMXPREPROCESS_HACKBLOCK_H
+#define GMX_GMXPREPROCESS_HACKBLOCK_H
 
-#include "typedefs.h"
-#include "../fileio/pdbio.h"
-#include "grompp.h"
-#include "gpp_atomtype.h"
+#include "gromacs/fileio/pdbio.h"
+#include "gromacs/gmxpreprocess/gpp_atomtype.h"
+#include "gromacs/gmxpreprocess/grompp-impl.h"
+#include "gromacs/legacyheaders/typedefs.h"
+#include "gromacs/topology/symtab.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -65,6 +66,7 @@ typedef struct {
     char  *s;              /* optional define string which gets copied from
                               .rtp/.tdb to .top and will be parsed by cpp
                               during grompp */
+    gmx_bool match;        /* boolean to mark that the entry has been found */
 } t_rbonded;
 
 typedef struct {
@@ -197,4 +199,4 @@ void init_t_protonate(t_protonate *protonate);
 }
 #endif
 
-#endif  /* _hackblock_h */
+#endif