Remove unnecessary config.h includes

[alexxy/gromacs.git] / src / gromacs / fileio / xdrd.c

diff --git a/src/gromacs/fileio/xdrd.c b/src/gromacs/fileio/xdrd.c
index 1ce76a4a2c112e69cef85168db9b28bc906ccbfb..7edfe5911a1a17ceddb26af239d88d8610a3adc8 100644 (file)
--- a/src/gromacs/fileio/xdrd.c
+++ b/src/gromacs/fileio/xdrd.c
@@ -2,8 +2,8 @@
  * This file is part of the GROMACS molecular simulation package.
  *
  * 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) 2001-2004, The GROMACS development team.
+ * 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.
@@ -34,14 +34,13 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "gmxpre.h"
 
-#include "typedefs.h"
 #include "xdrf.h"
-#include "gmx_fatal.h"
-#include "smalloc.h"
+
+#include "gromacs/math/vectypes.h"
+#include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/smalloc.h"
 
 int xdr_real(XDR *xdrs, real *r)
 {
@@ -109,7 +108,7 @@ int xdr_int64(XDR *xdrs, gmx_int64_t *i)
     imaj   = (int)imaj64;
     imin   = (int)imin64;
     ret    = xdr_int(xdrs, &imaj);
-    ret    = xdr_int(xdrs, &imin);
+    ret   |= xdr_int(xdrs, &imin);
 
     *i = (((gmx_int64_t)imaj << 32) | ((gmx_int64_t)imin & two_p32_m1));