git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10163 f3b2605a-c512-4ea7-a41b-209d697bcdaa

src/USER-MOLFILE/Makefile.lammps

@@ -25,5 +25,13 @@
 # Settings that the LAMMPS build will import when this package is installed
 
 molfile_SYSINC =
+ifneq ($(LIBOBJDIR),/Obj_mingw32)
+ifneq ($(LIBOBJDIR),/Obj_mingw64)
+ifneq ($(LIBOBJDIR),/Obj_mingw32-mpi)
+ifneq ($(LIBOBJDIR),/Obj_mingw64-mpi)
 molfile_SYSLIB = -ldl
+endif
+endif
+endif
+endif
 molfile_SYSPATH =

src/XTC/xdr_compat.h

@@ -60,7 +60,7 @@ extern "C" {
 
 typedef int bool_t;
 
-#if defined(__MINGW32_VERSION)
+#if defined(__MINGW32__)
 typedef char * caddr_t;
 typedef unsigned int u_int;
 #endif

src/lmpwindows.h

@@ -1,11 +1,11 @@
 #include <iso646.h>
-#if !defined(__MINGW32_VERSION)
+#if !defined(__MINGW32__)
 #include "erf.h"
 #endif
 #include "direct.h"
 #include "math.h"
 // LAMMPS uses usleep with 100 ms arguments, no microsecond precision needed
-#if !defined(__MINGW32_VERSION)
+#if !defined(__MINGW32__)
 #include "sleep.h"
 #endif
 
@@ -19,17 +19,11 @@
 
 // the following functions ared defined to get rid of
 // 'ambiguous call to overloaded function' error in VSS for mismathched type arguments
-
-#if defined(__MINGW32_VERSION)
-inline double pow(int i, int j){
-  return pow((double)i,(double) j);
-}
-#else
+#if !defined(__MINGW32__)
 inline double pow(int i, int j){
   return pow((double)i,j);
 }
 #endif
-
 inline double sqrt(int i){
   return sqrt((double) i);
 }