* To help us fund GROMACS development, we humbly ask that you cite
* the research papers on the package. Check out http://www.gromacs.org.
*/
-#include "config.h"
+#include "gmxpre.h"
+
+#include "topio.h"
#include <assert.h>
#include <ctype.h>
#include <sys/types.h>
-#include "gromacs/utility/futil.h"
-#include "typedefs.h"
-#include "gromacs/utility/smalloc.h"
-#include "macros.h"
#include "gromacs/fileio/gmxfio.h"
-#include "txtdump.h"
+#include "gromacs/gmxpreprocess/gmxcpp.h"
+#include "gromacs/gmxpreprocess/gpp_bond_atomtype.h"
+#include "gromacs/gmxpreprocess/gpp_nextnb.h"
+#include "gromacs/gmxpreprocess/grompp-impl.h"
+#include "gromacs/gmxpreprocess/topdirs.h"
+#include "gromacs/gmxpreprocess/toppush.h"
+#include "gromacs/gmxpreprocess/topshake.h"
+#include "gromacs/gmxpreprocess/toputil.h"
+#include "gromacs/gmxpreprocess/vsite_parm.h"
+#include "gromacs/legacyheaders/genborn.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/legacyheaders/names.h"
+#include "gromacs/legacyheaders/txtdump.h"
+#include "gromacs/legacyheaders/typedefs.h"
+#include "gromacs/legacyheaders/warninp.h"
#include "gromacs/math/units.h"
-#include "macros.h"
-#include "names.h"
-#include "gromacs/utility/cstringutil.h"
+#include "gromacs/math/utilities.h"
#include "gromacs/topology/block.h"
#include "gromacs/topology/symtab.h"
#include "gromacs/topology/topology.h"
+#include "gromacs/utility/cstringutil.h"
#include "gromacs/utility/fatalerror.h"
-#include "warninp.h"
-#include "vsite_parm.h"
-
-#include "grompp-impl.h"
-#include "toputil.h"
-#include "toppush.h"
-#include "topdirs.h"
-#include "gpp_nextnb.h"
-#include "topio.h"
-#include "topshake.h"
-#include "gmxcpp.h"
-#include "gpp_bond_atomtype.h"
-#include "genborn.h"
-#include "gromacs/math/utilities.h"
+#include "gromacs/utility/futil.h"
+#include "gromacs/utility/smalloc.h"
#define OPENDIR '[' /* starting sign for directive */
#define CLOSEDIR ']' /* ending sign for directive */
else
{
srenew(cppopts, ++ncppopts);
- cppopts[ncppopts-1] = strdup(buf);
+ cppopts[ncppopts-1] = gmx_strdup(buf);
}
sfree(buf);
ptr = rptr;
set_warning_line(wi, cpp_cur_file(&handle), cpp_cur_linenr(&handle));
- pline = strdup(line);
+ pline = gmx_strdup(line);
/* Strip trailing '\' from pline, if it exists */
sl = strlen(pline);
/* Since we depend on the '\' being present to continue to read, we copy line
* to a tmp string, strip the '\' from that string, and cat it to pline
*/
- tmp_line = strdup(line);
+ tmp_line = gmx_strdup(line);
sl = strlen(tmp_line);
if ((sl > 0) && (tmp_line[sl-1] == CONTINUE))
* without the brackets into dirstr, then
* skip spaces and tabs on either side of directive
*/
- dirstr = strdup((pline+1));
+ dirstr = gmx_strdup((pline+1));
if ((dummy2 = strchr (dirstr, CLOSEDIR)) != NULL)
{
(*dummy2) = 0;
break;
}
default:
- fprintf (stderr, "case: %d\n", d);
+ fprintf (stderr, "case: %d\n", (int)d);
gmx_incons("unknown directive");
}
}