From: Jim Meyering <jim@meyering.net>
Date: Mon, 15 Jul 2002 13:15:07 +0000 (+0000)
Subject: Remove unnecessary uses of `defined' when
X-Git-Tag: FILEUTILS-4_1_10~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=02bdcf7646b376660fe5d09a9a886a1f6eb5ff5e;p=thirdparty%2Fcoreutils.git

Remove unnecessary uses of `defined' when
operating on `HAVE_...' symbols.  Remove unnecessary parentheses.
---

diff --git a/src/uname.c b/src/uname.c
index 7b91f8af10..b32ca8df22 100644
--- a/src/uname.c
+++ b/src/uname.c
@@ -1,6 +1,6 @@
 /* uname -- print system information
 
-   Copyright 1989, 1992, 1993, 1996, 1997, 1999, 2000, 2001 Free
+   Copyright 1989, 1992, 1993, 1996, 1997, 1999, 2000, 2001, 2002 Free
    Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,7 @@
 #include <sys/utsname.h>
 #include <getopt.h>
 
-#if defined (HAVE_SYSINFO) && defined (HAVE_SYS_SYSTEMINFO_H)
+#if HAVE_SYSINFO && HAVE_SYS_SYSTEMINFO_H
 # include <sys/systeminfo.h>
 #endif
 
@@ -224,7 +224,7 @@ main (int argc, char **argv)
   if (toprint & PRINT_PROCESSOR)
     {
       char const *element = "unknown";
-#if defined (HAVE_SYSINFO) && defined (SI_ARCHITECTURE)
+#if HAVE_SYSINFO && defined SI_ARCHITECTURE
       char processor[257];
       if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
 	element = processor;
@@ -235,7 +235,7 @@ main (int argc, char **argv)
   if (toprint & PRINT_HARDWARE_PLATFORM)
     {
       char const *element = "unknown";
-#if defined (HAVE_SYSINFO) && defined (SI_PLATFORM)
+#if HAVE_SYSINFO && defined SI_PLATFORM
       char hardware_platform[257];
       if (0 <= sysinfo (SI_PLATFORM,
 			hardware_platform, sizeof hardware_platform))