* lib/autoconf/c.m4 (AC_LANG_FUNC_LINK_TRY(C)): Prefer "defined

FOO" to "defined (FOO)".
* lib/autoconf/functions.m4 (_AC_LIBOBJ_ALLOCA): Likewise.
* lib/autoconf/headers.m4 (AC_HEADER_STAT): Likewise.
* lib/autoconf/specific.m4 (AC_XENIX_DIR): Likewise.
* tests/tools.at (ifnames): Likewise.

diff --git a/ChangeLog b/ChangeLog
index c7e5e11627f05d9ad18334b392f61f0a04fb3303..bb5424909c650838eeebf3cb0f161213e0199d39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-01-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/autoconf/c.m4 (AC_LANG_FUNC_LINK_TRY(C)): Prefer "defined
+       FOO" to "defined (FOO)".
+       * lib/autoconf/functions.m4 (_AC_LIBOBJ_ALLOCA): Likewise.
+       * lib/autoconf/headers.m4 (AC_HEADER_STAT): Likewise.
+       * lib/autoconf/specific.m4 (AC_XENIX_DIR): Likewise.
+       * tests/tools.at (ifnames): Likewise.
+
 2006-01-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * lib/m4sugar/m4sh.m4 (AS_TMPDIR): Do not pass `-q' to mktemp.

diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index 7ccf96f537358a4f577125fc0a1793c65d15c63f..284a89157752c74909491182545892671adc0e6e 100644 (file)
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -215,7 +215,7 @@ char $1 ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$1) || defined (__stub___$1)
+#if defined __stub_$1 || defined __stub___$1
 choke me
 #endif
 ], [return $1 ();])])

diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
index 1a23847c54565ef2f75b16284ee5fee2fd069fcf..efa5c455a948090c073f9a6c68937f666f16b67f 100644 (file)
--- a/lib/autoconf/functions.m4
+++ b/lib/autoconf/functions.m4
@@ -1,6 +1,6 @@
 # This file is part of Autoconf.                       -*- Autoconf -*-
 # Checking for functions.
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software
 # Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -259,7 +259,7 @@ AC_DEFINE(C_ALLOCA, 1, [Define to 1 if using `alloca.c'.])
 
 AC_CACHE_CHECK(whether `alloca.c' needs Cray hooks, ac_cv_os_cray,
 [AC_EGREP_CPP(webecray,
-[#if defined(CRAY) && ! defined(CRAY2)
+[#if defined CRAY && ! defined CRAY2
 webecray
 #else
 wenotbecray

diff --git a/lib/autoconf/headers.m4 b/lib/autoconf/headers.m4
index 17505578ff961b626e2ba3c641f296ed9969e7de..43e15f0ffb2dcbc6229735c2d594fc2b763e52b7 100644 (file)
--- a/lib/autoconf/headers.m4
+++ b/lib/autoconf/headers.m4
@@ -1,7 +1,8 @@
 # This file is part of Autoconf.                       -*- Autoconf -*-
 # Checking for headers.
 #
-# Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006 Free Software
+# Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -483,25 +484,25 @@ AC_DEFUN([AC_HEADER_STAT],
 [AC_EGREP_CPP([You lose], [#include <sys/types.h>
 #include <sys/stat.h>
 
-#if defined(S_ISBLK) && defined(S_IFDIR)
+#if defined S_ISBLK && defined S_IFDIR
 # if S_ISBLK (S_IFDIR)
 You lose.
 # endif
 #endif
 
-#if defined(S_ISBLK) && defined(S_IFCHR)
+#if defined S_ISBLK && defined S_IFCHR
 # if S_ISBLK (S_IFCHR)
 You lose.
 # endif
 #endif
 
-#if defined(S_ISLNK) && defined(S_IFREG)
+#if defined S_ISLNK && defined S_IFREG
 # if S_ISLNK (S_IFREG)
 You lose.
 # endif
 #endif
 
-#if defined(S_ISSOCK) && defined(S_IFREG)
+#if defined S_ISSOCK && defined S_IFREG
 # if S_ISSOCK (S_IFREG)
 You lose.
 # endif

diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index 92dcf017c50be0ba8902c0576e78692a73a6b90f..1d141659e933bd7628921663af7329a78850e60b 100644 (file)
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -2,7 +2,7 @@
 # Macros that test for specific, unclassified, features.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -442,7 +442,7 @@ AC_DEFUN([AC_ISC_POSIX], [AC_SEARCH_LIBS(strerror, cposix)])
 AU_DEFUN([AC_XENIX_DIR],
 [AC_MSG_CHECKING([for Xenix])
 AC_EGREP_CPP(yes,
-[#if defined(M_XENIX) && !defined(M_UNIX)
+[#if defined M_XENIX && ! defined M_UNIX
   yes
 @%:@endif],
             [AC_MSG_RESULT([yes]); XENIX=yes],

diff --git a/tests/tools.at b/tests/tools.at
index 2de7004cca535eb8cb95dbfc9c422d6c437813f5..d2bbbf6043f65773e3e2bc033902b4c9d1d39a55 100644 (file)
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -2,7 +2,7 @@
 
 AT_BANNER([Executables (autoheader, autoupdate...).])
 
-# Copyright (C) 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003, 2004, 2006 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -319,7 +319,7 @@ AT_SETUP([ifnames])
 AT_DATA([iftest1.c],
 [[#ifdef DEF1
 #ifndef DEF2
-#if !defined(DEF3) && defined(DEF4) /* but not defined(DEF5) */
+#if ! defined DEF3 && defined DEF4 /* but not defined DEF5 */
     # if SPACES
        #       if      TABS
 /* #if C_COMMENTS */