Merge release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / fileio / futil.cpp

diff --git a/src/gromacs/fileio/futil.cpp b/src/gromacs/fileio/futil.cpp
index 6cacc9562de309618b5d4457fda0b1372b1c96d7..4d5056676a47dab3e9c90ca85f5364e77e7c7054 100644 (file)
--- a/src/gromacs/fileio/futil.cpp
+++ b/src/gromacs/fileio/futil.cpp
@@ -122,10 +122,7 @@ void push_ps(FILE *fp)
 #ifdef ffclose
 #undef ffclose
 #endif
-#endif
-
-#ifndef GMX_FAHCORE
-#ifndef HAVE_PIPES
+#if (!defined(HAVE_PIPES) && !defined(__native_client__))
 static FILE *popen(const char *nm, const char *mode)
 {
     gmx_impl("Sorry no pipes...");
@@ -139,8 +136,8 @@ static int pclose(FILE *fp)
 
     return 0;
 }
-#endif
-#endif
+#endif /* !defined(HAVE_PIPES) && !defined(__native_client__) */
+#endif /* GMX_FAHCORE */
 
 int ffclose(FILE *fp)
 {