Menu
▾
▴
Re: obsolete autoconf macros: CL_PROTO_*
|
From: Bruno H. <br...@cl...> - 2008-05-31 21:00:50
|
proto.m4 can be simplified by removing the K&R declaration argument:
2008-05-31 Bruno Haible <br...@cl...>
* m4/proto.m4 (CL_PROTO_RET, CL_PROTO_TRY, CL_PROTO_CONST): Remove
TRAD-DECL argument.
* m4/connect.m4 (CL_CONNECT): Update.
* m4/getpagesize.m4 (CL_GETPAGESIZE): Update.
* m4/ioctl.m4 (CL_IOCTL): Update.
* m4/putenv.m4 (CL_PUTENV): Update.
* m4/readline.m4 (CL_READLINE): Update.
* m4/rlimit.m4 (CL_RLIMIT): Update.
* m4/rusage.m4 (CL_RUSAGE): Update.
* m4/select.m4 (CL_SELECT): Update.
* m4/tcpconn.m4 (CL_TCPCONN): Update.
* m4/waitpid.m4 (CL_WAITPID): Update.
diff -c -3 -r1.6 connect.m4
*** src/m4/connect.m4 20 Jun 2007 15:02:17 -0000 1.6
--- src/m4/connect.m4 31 May 2008 20:53:46 -0000
***************
*** 1,5 ****
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2004, 2007 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
--- 1,5 ----
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2004, 2007-2008 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
***************
*** 24,30 ****
#endif
#include <sys/types.h>
#include <sys/socket.h>
! ], [int connect (int fd, $x $y name, $z namelen);], [int connect();], [
cl_cv_proto_connect_arg2a="$x"
cl_cv_proto_connect_arg2b="$y"
cl_cv_proto_connect_arg3="$z"
--- 24,30 ----
#endif
#include <sys/types.h>
#include <sys/socket.h>
! ], [int connect (int fd, $x $y name, $z namelen);], [
cl_cv_proto_connect_arg2a="$x"
cl_cv_proto_connect_arg2b="$y"
cl_cv_proto_connect_arg3="$z"
diff -c -3 -r1.3 getpagesize.m4
*** src/m4/getpagesize.m4 3 Aug 2003 00:22:38 -0000 1.3
--- src/m4/getpagesize.m4 31 May 2008 20:53:46 -0000
***************
*** 1,5 ****
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2003 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
--- 1,5 ----
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2008 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
***************
*** 27,33 ****
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
! ], [int getpagesize();], [int getpagesize();],
cl_cv_proto_getpagesize_ret, int, size_t)
], [extern $cl_cv_proto_getpagesize_ret getpagesize (void);])
AC_DEFINE_UNQUOTED(RETGETPAGESIZETYPE,$cl_cv_proto_getpagesize_ret,[return type of getpagesize()])
--- 27,33 ----
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
! ], [int getpagesize();],
cl_cv_proto_getpagesize_ret, int, size_t)
], [extern $cl_cv_proto_getpagesize_ret getpagesize (void);])
AC_DEFINE_UNQUOTED(RETGETPAGESIZETYPE,$cl_cv_proto_getpagesize_ret,[return type of getpagesize()])
diff -c -3 -r1.13 ioctl.m4
*** src/m4/ioctl.m4 31 May 2008 14:55:50 -0000 1.13
--- src/m4/ioctl.m4 31 May 2008 20:53:46 -0000
***************
*** 69,75 ****
#ifdef INCLUDE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif
! ], [int ioctl (int fd, $x request, $y);], [int ioctl();], [
cl_cv_proto_ioctl_arg2="$x"
if test "$y" = "..."; then
cl_cv_proto_ioctl_dots=yes
--- 69,75 ----
#ifdef INCLUDE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif
! ], [int ioctl (int fd, $x request, $y);], [
cl_cv_proto_ioctl_arg2="$x"
if test "$y" = "..."; then
cl_cv_proto_ioctl_dots=yes
diff -c -3 -r1.4 proto.m4
*** src/m4/proto.m4 20 Jun 2007 15:02:17 -0000 1.4
--- src/m4/proto.m4 31 May 2008 20:53:46 -0000
***************
*** 1,5 ****
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2002, 2007 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
--- 1,5 ----
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2002, 2007-2008 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
***************
*** 20,52 ****
}[$]cl_cv_proto_$1)
])
! 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
! [#if defined(__STDC__) || defined(__cplusplus)
! $2
! #else
! $3
! #endif
! ], [], $4="$5", $4="$6")
])
! 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
! [#if defined(__STDC__) || defined(__cplusplus)
! $2
! #else
! $3
! #endif
! ], [], [$4], [$5])
])
! dnl CL_PROTO_CONST(INCLUDES, ANSI-DECL, TRAD-DECL, CACHE-ID)
AC_DEFUN([CL_PROTO_CONST],
! [CL_PROTO_TRY([$1], [$2], [$3], $4="", $4="const")]
)
dnl CL_PROTO_MISSING(function_name)
--- 20,44 ----
}[$]cl_cv_proto_$1)
])
! dnl CL_PROTO_RET(INCLUDES, 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")
])
! dnl CL_PROTO_TRY(INCLUDES, DECL, ACTION-IF-OK, ACTION-IF-FAILS)
AC_DEFUN([CL_PROTO_TRY],
[AC_TRY_COMPILE([$1]
AC_LANG_EXTERN
! [$2
! ], [], [$3], [$4])
])
! dnl CL_PROTO_CONST(INCLUDES, DECL, CACHE-ID)
AC_DEFUN([CL_PROTO_CONST],
! [CL_PROTO_TRY([$1], [$2], $3="", $3="const")]
)
dnl CL_PROTO_MISSING(function_name)
diff -c -3 -r1.8 putenv.m4
*** src/m4/putenv.m4 6 Dec 2005 00:49:58 -0000 1.8
--- src/m4/putenv.m4 31 May 2008 20:53:46 -0000
***************
*** 1,5 ****
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2005 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
--- 1,5 ----
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2008 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
***************
*** 26,32 ****
#endif])
if test "$ac_cv_func_unsetenv" = yes; then
AC_MSG_CHECKING(return value of unsetenv)
! CL_PROTO_RET([#include <stdlib.h>],[int unsetenv(char*);],[int unsetenv();],
cl_cv_proto_unsetenv_ret,int,void)
AC_MSG_RESULT($cl_cv_proto_unsetenv_ret)
if test "$cl_cv_proto_unsetenv_ret" = int;
--- 26,32 ----
#endif])
if test "$ac_cv_func_unsetenv" = yes; then
AC_MSG_CHECKING(return value of unsetenv)
! CL_PROTO_RET([#include <stdlib.h>],[int unsetenv(char*);],
cl_cv_proto_unsetenv_ret,int,void)
AC_MSG_RESULT($cl_cv_proto_unsetenv_ret)
if test "$cl_cv_proto_unsetenv_ret" = int;
diff -c -3 -r1.22 readline.m4
*** src/m4/readline.m4 9 Dec 2005 15:37:11 -0000 1.22
--- src/m4/readline.m4 31 May 2008 20:53:46 -0000
***************
*** 1,5 ****
dnl -*- Autoconf -*-
! dnl Copyright (C) 2002-2005 Sam Steingold, Bruno Haible
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
--- 1,5 ----
dnl -*- Autoconf -*-
! dnl Copyright (C) 2002-2008 Sam Steingold, Bruno Haible
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
***************
*** 42,48 ****
CL_PROTO_CONST([
#include <stdio.h>
#include <readline/readline.h>
! ],[char* ${RL_FCF} (char *, int);], [char* ${RL_FCF}();],
cl_cv_proto_readline_const) ],
[extern char* ${RL_FCF}($cl_cv_proto_readline_const char*, int);])
AC_CHECK_DECLS([rl_already_prompted, rl_readline_name, rl_gnu_readline_p],,,
--- 42,48 ----
CL_PROTO_CONST([
#include <stdio.h>
#include <readline/readline.h>
! ],[char* ${RL_FCF} (char *, int);],
cl_cv_proto_readline_const) ],
[extern char* ${RL_FCF}($cl_cv_proto_readline_const char*, int);])
AC_CHECK_DECLS([rl_already_prompted, rl_readline_name, rl_gnu_readline_p],,,
diff -c -3 -r1.4 rlimit.m4
*** src/m4/rlimit.m4 28 Mar 2005 00:04:51 -0000 1.4
--- src/m4/rlimit.m4 31 May 2008 20:53:46 -0000
***************
*** 1,5 ****
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2003 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
--- 1,5 ----
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2008 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
***************
*** 26,32 ****
#include <sys/resource.h>
],
[int getrlimit (int resource, struct rlimit * rlim);],
- [int getrlimit();],
[cl_cv_proto_getrlimit_arg1="int"],
[cl_cv_proto_getrlimit_arg1="enum __rlimit_resource"])
], [extern int getrlimit ($cl_cv_proto_getrlimit_arg1, struct rlimit *);])
--- 26,31 ----
***************
*** 41,47 ****
#include <sys/time.h>
#include <sys/resource.h>
], [int setrlimit (RLIMIT_RESOURCE_T resource, struct rlimit * rlim);],
- [int setrlimit();],
cl_cv_proto_setrlimit_arg2)
], [extern int setrlimit ($cl_cv_proto_getrlimit_arg1, $cl_cv_proto_setrlimit_arg2 struct rlimit *);])
AC_DEFINE_UNQUOTED(SETRLIMIT_CONST,$cl_cv_proto_setrlimit_arg2,[declaration of setrlimit() needs const])
--- 40,45 ----
diff -c -3 -r1.7 rusage.m4
*** src/m4/rusage.m4 29 May 2008 19:17:12 -0000 1.7
--- src/m4/rusage.m4 31 May 2008 20:53:46 -0000
***************
*** 1,5 ****
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2005 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
--- 1,5 ----
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2008 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
***************
*** 30,36 ****
#include <sys/resource.h>
],
[int getrusage (int who, struct rusage * rusage);],
- [int getrusage();],
[cl_cv_proto_getrusage_arg1="int"],
[cl_cv_proto_getrusage_arg1="enum __rusage_who"])
], [extern int getrusage ($cl_cv_proto_getrusage_arg1, struct rusage *);])dnl
--- 30,35 ----
diff -c -3 -r1.10 select.m4
*** src/m4/select.m4 31 May 2008 20:10:43 -0000 1.10
--- src/m4/select.m4 31 May 2008 20:53:46 -0000
***************
*** 54,61 ****
#include <sys/select.h>
#endif
], [int select ($x width, $y * readfds, $y * writefds, $y * exceptfds, $z struct timeval * timeout);],
! [int select();], [
! cl_cv_proto_select_arg1="$x"
cl_cv_proto_select_arg2="$y"
cl_cv_proto_select_arg5="$z"
have_select=1])
--- 54,60 ----
#include <sys/select.h>
#endif
], [int select ($x width, $y * readfds, $y * writefds, $y * exceptfds, $z struct timeval * timeout);],
! [cl_cv_proto_select_arg1="$x"
cl_cv_proto_select_arg2="$y"
cl_cv_proto_select_arg5="$z"
have_select=1])
diff -c -3 -r1.10 tcpconn.m4
*** src/m4/tcpconn.m4 20 Jun 2007 15:02:17 -0000 1.10
--- src/m4/tcpconn.m4 31 May 2008 20:53:46 -0000
***************
*** 1,5 ****
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2004, 2007 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
--- 1,5 ----
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2004, 2007-2008 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
***************
*** 53,59 ****
#include <sys/socket.h>
#include <netdb.h>
#endif
! ], [$y inet_addr ($x char *);], [$y inet_addr();], [
cl_cv_proto_inet_addr_ret="$y"
cl_cv_proto_inet_addr_arg1="$x"
have_inet_addr=1])
--- 53,59 ----
#include <sys/socket.h>
#include <netdb.h>
#endif
! ], [$y inet_addr ($x char *);], [
cl_cv_proto_inet_addr_ret="$y"
cl_cv_proto_inet_addr_arg1="$x"
have_inet_addr=1])
***************
*** 87,93 ****
CL_PROTO_TRY([
#include <sys/types.h>
#include <sys/socket.h>
! ], [int setsockopt (int, int, int, $x $y, $z);], [int setsockopt ();], [
cl_cv_proto_setsockopt_const="$x"
cl_cv_proto_setsockopt_arg_t="$y"
cl_cv_proto_setsockopt_optlen_t="$z"
--- 87,93 ----
CL_PROTO_TRY([
#include <sys/types.h>
#include <sys/socket.h>
! ], [int setsockopt (int, int, int, $x $y, $z);], [
cl_cv_proto_setsockopt_const="$x"
cl_cv_proto_setsockopt_arg_t="$y"
cl_cv_proto_setsockopt_optlen_t="$z"
diff -c -3 -r1.2 waitpid.m4
*** src/m4/waitpid.m4 3 Aug 2003 00:22:38 -0000 1.2
--- src/m4/waitpid.m4 31 May 2008 20:53:46 -0000
***************
*** 1,5 ****
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2003 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
--- 1,5 ----
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2008 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
***************
*** 19,25 ****
#endif
#include <sys/types.h>
], [pid_t waitpid (pid_t pid, int* statusp, int options);],
- [pid_t waitpid();],
cl_cv_proto_waitpid_arg1="pid_t", cl_cv_proto_waitpid_arg1="int")
], [extern pid_t waitpid ($cl_cv_proto_waitpid_arg1, int*, int);])
AC_DEFINE_UNQUOTED(PID_T,$cl_cv_proto_waitpid_arg1,[type of `pid' in waitpid() declaration])
--- 19,24 ----
|