Revert "Update gnulib to current upstream master"

[deliverable/binutils-gdb.git] / gdb / gnulib / import / m4 / getlogin_r.m4

diff --git a/gdb/gnulib/import/m4/getlogin_r.m4 b/gdb/gnulib/import/m4/getlogin_r.m4
index 0b04a5fba768cadfb665046deb30dde8745fe46f..80f82f4f926b9aa79bbeb5749ff9f656031212a8 100644 (file)
--- a/gdb/gnulib/import/m4/getlogin_r.m4
+++ b/gdb/gnulib/import/m4/getlogin_r.m4
@@ -1,6 +1,6 @@
-#serial 12
+#serial 11
 
-# Copyright (C) 2005-2007, 2009-2018 Free Software Foundation, Inc.
+# Copyright (C) 2005-2007, 2009-2016 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -30,8 +30,8 @@ AC_DEFUN([gl_FUNC_GETLOGIN_R],
     HAVE_GETLOGIN_R=0
   else
     HAVE_GETLOGIN_R=1
-    dnl On Mac OS X 10.12 and OSF/1 5.1, getlogin_r returns a truncated result
-    dnl if the buffer is not large enough.
+    dnl On OSF/1 5.1, getlogin_r returns a truncated result if the buffer is
+    dnl not large enough.
     AC_REQUIRE([AC_CANONICAL_HOST])
     AC_CACHE_CHECK([whether getlogin_r works with small buffers],
       [gl_cv_func_getlogin_r_works],
@@ -39,16 +39,15 @@ AC_DEFUN([gl_FUNC_GETLOGIN_R],
         dnl Initial guess, used when cross-compiling.
 changequote(,)dnl
         case "$host_os" in
-                          # Guess no on Mac OS X, OSF/1.
-          darwin* | osf*) gl_cv_func_getlogin_r_works="guessing no" ;;
-                          # Guess yes otherwise.
-          *)              gl_cv_func_getlogin_r_works="guessing yes" ;;
+                # Guess no on OSF/1.
+          osf*) gl_cv_func_getlogin_r_works="guessing no" ;;
+                # Guess yes otherwise.
+          *)    gl_cv_func_getlogin_r_works="guessing yes" ;;
         esac
 changequote([,])dnl
         AC_RUN_IFELSE(
           [AC_LANG_SOURCE([[
 #include <stddef.h>
-#include <string.h>
 #include <unistd.h>
 #if !HAVE_DECL_GETLOGIN_R
 extern
@@ -64,19 +63,16 @@ main (void)
   char buf[100];
 
   if (getlogin_r (buf, 0) == 0)
-    result |= 1;
+    result |= 16;
   if (getlogin_r (buf, 1) == 0)
-    result |= 2;
-  if (getlogin_r (buf, 100) == 0)
-    {
-      size_t n = strlen (buf);
-      if (getlogin_r (buf, n) == 0)
-        result |= 4;
-    }
+    result |= 17;
   return result;
 }]])],
           [gl_cv_func_getlogin_r_works=yes],
-          [gl_cv_func_getlogin_r_works=no],
+          [case $? in
+             16 | 17) gl_cv_func_getlogin_r_works=no ;;
+           esac
+          ],
           [:])
       ])
     case "$gl_cv_func_getlogin_r_works" in