From 336894a92f93a712b76cc9925d4a1614ab5963c6 Mon Sep 17 00:00:00 2001
From: David van der Spoel <spoel@xray.bmc.uu.se>
Date: Wed, 30 Sep 2015 10:48:22 +0200
Subject: [PATCH] Removed types/nblist.h and types/nsgrid.h from typedefs.h

Change-Id: If3f8e5f4bf8d132300d361b1a80578fa7a3593ef
---
 src/gromacs/legacyheaders/genborn.h        | 1 +
 src/gromacs/legacyheaders/ns.h             | 1 +
 src/gromacs/legacyheaders/nsgrid.h         | 1 +
 src/gromacs/legacyheaders/typedefs.h       | 2 --
 src/gromacs/legacyheaders/types/forcerec.h | 1 +
 src/gromacs/legacyheaders/types/nblist.h   | 4 ++--
 src/gromacs/legacyheaders/types/nsgrid.h   | 4 ++--
 7 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/gromacs/legacyheaders/genborn.h b/src/gromacs/legacyheaders/genborn.h
index 61286b4293..aa19b3c9a0 100644
--- a/src/gromacs/legacyheaders/genborn.h
+++ b/src/gromacs/legacyheaders/genborn.h
@@ -48,6 +48,7 @@ struct t_forcerec;
 struct t_graph;
 struct t_inputrec;
 struct t_mdatoms;
+struct t_nblist;
 struct t_pbc;
 
 #ifdef __cplusplus
diff --git a/src/gromacs/legacyheaders/ns.h b/src/gromacs/legacyheaders/ns.h
index 92fff91d8a..63754c2226 100644
--- a/src/gromacs/legacyheaders/ns.h
+++ b/src/gromacs/legacyheaders/ns.h
@@ -46,6 +46,7 @@ struct gmx_ns_t;
 struct t_commrec;
 struct t_forcerec;
 struct t_mdatoms;
+struct t_nblist;
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/gromacs/legacyheaders/nsgrid.h b/src/gromacs/legacyheaders/nsgrid.h
index 30289a4b19..10ca6ef9b5 100644
--- a/src/gromacs/legacyheaders/nsgrid.h
+++ b/src/gromacs/legacyheaders/nsgrid.h
@@ -41,6 +41,7 @@ struct gmx_domdec_t;
 struct gmx_domdec_zones_t;
 struct gmx_ddbox_t;
 struct t_forcerec;
+struct t_grid;
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/gromacs/legacyheaders/typedefs.h b/src/gromacs/legacyheaders/typedefs.h
index e69e25cf18..744a3d4550 100644
--- a/src/gromacs/legacyheaders/typedefs.h
+++ b/src/gromacs/legacyheaders/typedefs.h
@@ -42,9 +42,7 @@
 /* DEPRECATED! value for signaling unitialized variables */
 #define NOTSET -12345
 
-#include "gromacs/legacyheaders/types/nblist.h"
 #include "gromacs/legacyheaders/types/nrnb.h"
-#include "gromacs/legacyheaders/types/nsgrid.h"
 #include "gromacs/legacyheaders/types/oenv.h"
 #include "gromacs/legacyheaders/types/simple.h"
 #include "gromacs/legacyheaders/types/state.h"
diff --git a/src/gromacs/legacyheaders/types/forcerec.h b/src/gromacs/legacyheaders/types/forcerec.h
index d231e336c7..a3fcdd16bb 100644
--- a/src/gromacs/legacyheaders/types/forcerec.h
+++ b/src/gromacs/legacyheaders/types/forcerec.h
@@ -61,6 +61,7 @@ extern "C" {
 struct gmx_pme_t;
 struct nonbonded_verlet_t;
 struct bonded_threading_t;
+struct t_nblist;
 
 /* Structure describing the data in a single table */
 typedef struct
diff --git a/src/gromacs/legacyheaders/types/nblist.h b/src/gromacs/legacyheaders/types/nblist.h
index df4b290ba1..1567200b4b 100644
--- a/src/gromacs/legacyheaders/types/nblist.h
+++ b/src/gromacs/legacyheaders/types/nblist.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2012,2014, by the GROMACS development team, led by
+ * Copyright (c) 2012,2014,2015, 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.
@@ -54,7 +54,7 @@ typedef unsigned long t_excl;
  */
 #define MAX_CGCGSIZE 32
 
-typedef struct
+typedef struct t_nblist
 {
     int             igeometry;    /* The type of list (atom, water, etc.)  */
     int             ielec;        /* Coulomb loop type index for kernels   */
diff --git a/src/gromacs/legacyheaders/types/nsgrid.h b/src/gromacs/legacyheaders/types/nsgrid.h
index 90c6d11d47..d90bb9c557 100644
--- a/src/gromacs/legacyheaders/types/nsgrid.h
+++ b/src/gromacs/legacyheaders/types/nsgrid.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2010,2014, by the GROMACS development team, led by
+ * Copyright (c) 2010,2014,2015, 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.
@@ -45,7 +45,7 @@ extern "C" {
 #endif
 
 
-typedef struct {
+typedef struct t_grid {
     int     nr;           /* Total number of charge groups	*/
     int     nboundeddim;  /* The number of bounded dimensions     */
     int     npbcdim;      /* The number of dimensions with pbc    */
-- 
2.11.4.GIT