Adding changes from Mike Brown.

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3883 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-03-04 22:35:29 +00:00
parent 780ba6e377
commit c0e0b65619
20 changed files with 578 additions and 611 deletions
--- a/lib/gpu/nvc_macros.h
+++ b/lib/gpu/nvc_macros.h
@ -20,6 +20,12 @@
 #ifndef NVC_MACROS_H
 #define NVC_MACROS_H

+#if defined(__APPLE__)
+#if _GLIBCXX_ATOMIC_BUILTINS == 1
+#undef _GLIBCXX_ATOMIC_BUILTINS
+#endif // _GLIBCXX_ATOMIC_BUILTINS
+#endif // __APPLE__
+
 #include <stdio.h>
 #include "math_constants.h"
 #define INT_MUL(x,y)	(__mul24(x,y))