Merge release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / gmxlib / main.cpp

diff --git a/src/gromacs/gmxlib/main.cpp b/src/gromacs/gmxlib/main.cpp
index 69c0b752cd128cabea53da93b4d71ce30aa7a6b5..4ed60e62120339a3a27e9970a72f61d7f3f631eb 100644 (file)
--- a/src/gromacs/gmxlib/main.cpp
+++ b/src/gromacs/gmxlib/main.cpp
@@ -222,22 +222,23 @@ void check_multi_int64(FILE *log, const gmx_multisim_t *ms,
 }
 
 
-char *gmx_gethostname(char *name, size_t len)
+int gmx_gethostname(char *name, size_t len)
 {
     if (len < 8)
     {
         gmx_incons("gmx_gethostname called with len<8");
     }
-#ifdef HAVE_UNISTD_H
+#if defined(HAVE_UNISTD_H) && !defined(__native_client__)
     if (gethostname(name, len-1) != 0)
     {
         strncpy(name, "unknown", 8);
+        return -1;
     }
+    return 0;
 #else
     strncpy(name, "unknown", 8);
+    return -1;
 #endif
-
-    return name;
 }