@@ -1,14 +1,13 @@
-dnl -*- Autoconf -*-
-dnl Copyright (C) 1993-2002, 2007-2008 Free Software Foundation, Inc.
+dnl Copyright (C) 1993-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
 dnl that contains a configuration script generated by Autoconf, under
 dnl the same distribution terms as the rest of that program.
 
-dnl From Bruno Haible, Marcus Daniels, Sam Steingold.
+dnl From Bruno Haible, Marcus Daniels.
 
 AC_PREREQ(2.13)
 
 dnl CL_PROTO(IDENTIFIER, ACTION-IF-NOT-FOUND, FINAL-PROTOTYPE)
 AC_DEFUN([CL_PROTO],
@@ -18,32 +17,33 @@
 cl_cv_proto_$1=`echo "[$]cl_cv_proto_$1" | tr -s ' ' | sed -e 's/( /(/'`
 AC_MSG_RESULT([$]{ac_t:-
          }[$]cl_cv_proto_$1)
 ])
 
-dnl CL_PROTO_RET(INCLUDES, DECL, CACHE-ID, TYPE-IF-OK, TYPE-IF-FAILS)
+dnl CL_PROTO_RET(INCLUDES, ANSI-DECL, TRAD-DECL, CACHE-ID, TYPE-IF-OK, TYPE-IF-FAILS)
 AC_DEFUN([CL_PROTO_RET],
 [AC_TRY_COMPILE([$1]
 AC_LANG_EXTERN
-[$2
-], [], $3="$4", $3="$5")
+[#if defined(__STDC__) || defined(__cplusplus)
+$2
+#else
+$3
+#endif
+], [], $4="$5", $4="$6")
 ])
 
-dnl CL_PROTO_TRY(INCLUDES, DECL, ACTION-IF-OK, ACTION-IF-FAILS)
+dnl CL_PROTO_TRY(INCLUDES, ANSI-DECL, TRAD-DECL, ACTION-IF-OK, ACTION-IF-FAILS)
 AC_DEFUN([CL_PROTO_TRY],
 [AC_TRY_COMPILE([$1]
 AC_LANG_EXTERN
-[$2
-], [], [$3], [$4])
+[#if defined(__STDC__) || defined(__cplusplus)
+$2
+#else
+$3
+#endif
+], [], [$4], [$5])
 ])
 
-dnl CL_PROTO_CONST(INCLUDES, DECL, CACHE-ID)
+dnl CL_PROTO_CONST(INCLUDES, ANSI-DECL, TRAD-DECL, CACHE-ID)
 AC_DEFUN([CL_PROTO_CONST],
-[CL_PROTO_TRY([$1], [$2], $3="", $3="const")]
-)
-
-dnl CL_PROTO_MISSING(function_name)
-AC_DEFUN([CL_PROTO_MISSING],
-[AC_MSG_FAILURE([please report the $1() declaration on your platform to $PACKAGE_NAME developers at $PACKAGE_BUGREPORT])])
-
-m4_define([CONST_VARIANTS],['' 'const' '__const'])
-m4_define([SIZE_VARIANTS],['unsigned int' 'int' 'unsigned long' 'long' 'size_t' 'socklen_t'])
+[CL_PROTO_TRY([$1], [$2], [$3], $4="", $4="const")]
+)