X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgetdomainname.m4;h=db9a21936d8af4f7e62dd25ee395ff93610e05cf;hb=72c63c089365640c7f1acd97fb72ee26932ac2b3;hp=9e93fc93cde4fb918d12796910045921beecec56;hpb=3a664e68b715e2a20d0bd8ca64cdc10c56316ab3;p=gnulib.git

diff --git a/m4/getdomainname.m4 b/m4/getdomainname.m4
index 9e93fc93c..db9a21936 100644
--- a/m4/getdomainname.m4
+++ b/m4/getdomainname.m4
@@ -1,5 +1,5 @@
-# getdomainname.m4 serial 7
-dnl Copyright (C) 2002-2003, 2008-2011 Free Software Foundation, Inc.
+# getdomainname.m4 serial 10
+dnl Copyright (C) 2002-2003, 2008-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -28,7 +28,11 @@ AC_DEFUN([gl_FUNC_GETDOMAINNAME],
        AC_LINK_IFELSE(
          [AC_LANG_PROGRAM(
             [[#include <stddef.h>
-              extern int getdomainname (char *, size_t);
+              extern
+              #ifdef __cplusplus
+              "C"
+              #endif
+              int getdomainname (char *, size_t);
             ]],
             [[getdomainname(NULL, 0);]])],
          [gl_cv_func_getdomainname_in_libnsl=yes])
@@ -38,18 +42,18 @@ AC_DEFUN([gl_FUNC_GETDOMAINNAME],
 
   dnl What about the declaration?
   dnl - It's  int getdomainname(char *, size_t)  on glibc, NetBSD, OpenBSD.
-  dnl - It's  int getdomainname(char *, int)  on MacOS X, FreeBSD, AIX, IRIX,
+  dnl - It's  int getdomainname(char *, int)  on Mac OS X, FreeBSD, AIX, IRIX,
   dnl   OSF/1.
   AC_CHECK_DECLS([getdomainname], , ,
-    [#include <sys/types.h>
-     #ifdef HAVE_SYS_SOCKET_H
-     #include <sys/socket.h>
-     #endif
-     #ifdef HAVE_NETDB_H
-     #include <netdb.h>
-     #endif
-     #include <unistd.h>
-    ])
+    [[#include <sys/types.h>
+      #ifdef HAVE_SYS_SOCKET_H
+      #include <sys/socket.h>
+      #endif
+      #ifdef HAVE_NETDB_H
+      #include <netdb.h>
+      #endif
+      #include <unistd.h>
+    ]])
   AC_CACHE_CHECK([for getdomainname's second argument type],
     [gl_cv_decl_getdomainname_argtype2],
     [if test $ac_cv_have_decl_getdomainname; then
@@ -63,7 +67,12 @@ AC_DEFUN([gl_FUNC_GETDOMAINNAME],
               #include <netdb.h>
               #endif
               #include <unistd.h>
-              extern int getdomainname (char *, int);]],
+              extern
+              #ifdef __cplusplus
+              "C"
+              #endif
+              int getdomainname (char *, int);
+            ]],
             [[]])],
          [gl_cv_decl_getdomainname_argtype2='int'],
          [gl_cv_decl_getdomainname_argtype2='size_t'])