gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / m4 / getlogin_r.m4

diff --git a/m4/getlogin_r.m4 b/m4/getlogin_r.m4
index 9cda9a4..78255ca 100644 (file)
--- a/m4/getlogin_r.m4
+++ b/m4/getlogin_r.m4
@@ -1,6 +1,6 @@
-#serial 9
+#serial 11
 
-# Copyright (C) 2005-2007, 2009-2010 Free Software Foundation, Inc.
+# Copyright (C) 2005-2007, 2009-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -50,7 +50,11 @@ changequote([,])dnl
 #include <stddef.h>
 #include <unistd.h>
 #if !HAVE_DECL_GETLOGIN_R
-extern int getlogin_r (char *, size_t);
+extern
+# ifdef __cplusplus
+"C"
+# endif
+int getlogin_r (char *, size_t);
 #endif
 int
 main (void)
@@ -76,10 +80,6 @@ main (void)
       *) REPLACE_GETLOGIN_R=1 ;;
     esac
   fi
-  if test $HAVE_GETLOGIN_R = 0 || test $REPLACE_GETLOGIN_R = 1; then
-    AC_LIBOBJ([getlogin_r])
-    gl_PREREQ_GETLOGIN_R
-  fi
 ])
 
 AC_DEFUN([gl_PREREQ_GETLOGIN_R],