* the research papers on the package. Check out http://www.gromacs.org.
*/
/* This file is completely threadsafe - keep it that way! */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "gmxpre.h"
+
+#include "nm2type.h"
#include <string.h>
-#include "gromacs/math/utilities.h"
-#include "macros.h"
-#include "bondf.h"
-#include "gromacs/utility/cstringutil.h"
-#include "gromacs/utility/smalloc.h"
#include "gromacs/fileio/confio.h"
+#include "gromacs/gmxpreprocess/fflibutil.h"
+#include "gromacs/gmxpreprocess/gpp_atomtype.h"
+#include "gromacs/gmxpreprocess/gpp_nextnb.h"
+#include "gromacs/gmxpreprocess/pdb2top.h"
+#include "gromacs/gmxpreprocess/toppush.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/legacyheaders/names.h"
+#include "gromacs/legacyheaders/readinp.h"
+#include "gromacs/legacyheaders/txtdump.h"
+#include "gromacs/math/utilities.h"
#include "gromacs/math/vec.h"
-#include "txtdump.h"
-#include "readinp.h"
-#include "names.h"
-#include "toppush.h"
-#include "pdb2top.h"
-#include "gpp_nextnb.h"
-#include "gpp_atomtype.h"
-#include "fflibutil.h"
-
-#include "nm2type.h"
-
+#include "gromacs/utility/cstringutil.h"
#include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/smalloc.h"
static void rd_nm2type_file(const char *fn, int *nnm, t_nm2type **nmp)
{
{
gmx_fatal(FARGS, "Error on line %d of %s", line, libfilename);
}
- newbuf[i] = strdup(nbbuf);
+ newbuf[i] = gmx_strdup(nbbuf);
strcat(format, "%*s%*s");
}
}
{
newbuf = NULL;
}
- nm2t[nnnm].elem = strdup(elem);
- nm2t[nnnm].type = strdup(type);
+ nm2t[nnnm].elem = gmx_strdup(elem);
+ nm2t[nnnm].type = gmx_strdup(type);
nm2t[nnnm].q = qq;
nm2t[nnnm].m = mm;
nm2t[nnnm].nbonds = nb;