From unknown Tue Jun 17 20:14:12 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#11905 <11905@debbugs.gnu.org> To: bug#11905 <11905@debbugs.gnu.org> Subject: Status: Unnecessary '#define unix' in src/s/aix4-2.h Reply-To: bug#11905 <11905@debbugs.gnu.org> Date: Wed, 18 Jun 2025 03:14:12 +0000 retitle 11905 Unnecessary '#define unix' in src/s/aix4-2.h reassign 11905 emacs submitter 11905 Glenn Morris severity 11905 minor thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 10 19:31:27 2012 Received: (at submit) by debbugs.gnu.org; 10 Jul 2012 23:31:27 +0000 Received: from localhost ([127.0.0.1]:60912 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Sojtu-0004Px-9V for submit@debbugs.gnu.org; Tue, 10 Jul 2012 19:31:26 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:35426) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Sojtr-0004Pq-Lf for submit@debbugs.gnu.org; Tue, 10 Jul 2012 19:31:24 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1Sojod-0007xB-O8; Tue, 10 Jul 2012 19:25:59 -0400 From: Glenn Morris To: submit@debbugs.gnu.org Subject: Unnecessary '#define unix' in src/s/aix4-2.h X-Debbugs-Cc: Paul Eggert X-Spook: beanpole cypherpunk Serbian Ft. Knox [Hello to all my X-Ran: _}#~T._p&N#"dyr"L,Rt:};*oBW]8&t](ptah)ODk2*aHLm_sP7wq%4a/CbZkJ2PZo4qhH X-Hue: green X-Debbugs-No-Ack: yes X-Attribution: GM Date: Tue, 10 Jul 2012 19:25:59 -0400 Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -6.9 (------) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.9 (------) Package: emacs Version: 24.1.50 Severity: minor src/s/aix4-2.h does this: /* AIX doesn't define this. */ #define unix 1 The only place left in Emacs that references '#ifdef unix' is lib/getloadavg.c, from Gnulib. I suspect that Gnulib already has the AIX case covered (via "__unix"?), so that src/s/aix4-2.h no longer needs to define "unix". But I'm not sure, hence this report... From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 10 19:57:50 2012 Received: (at 11905) by debbugs.gnu.org; 10 Jul 2012 23:57:50 +0000 Received: from localhost ([127.0.0.1]:60929 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SokJS-0004zg-DA for submit@debbugs.gnu.org; Tue, 10 Jul 2012 19:57:50 -0400 Received: from smtp.cs.ucla.edu ([131.179.128.62]:52017) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SokJQ-0004zZ-3J for 11905@debbugs.gnu.org; Tue, 10 Jul 2012 19:57:49 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 792D8A60001; Tue, 10 Jul 2012 16:52:24 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SpBEjxaRz53Z; Tue, 10 Jul 2012 16:52:22 -0700 (PDT) Received: from [192.168.1.4] (pool-108-23-119-2.lsanca.fios.verizon.net [108.23.119.2]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id D871339E8007; Tue, 10 Jul 2012 16:52:22 -0700 (PDT) Message-ID: <4FFCC037.3050801@cs.ucla.edu> Date: Tue, 10 Jul 2012 16:52:23 -0700 From: Paul Eggert Organization: UCLA Computer Science Department User-Agent: Mozilla/5.0 (X11; Linux i686; rv:13.0) Gecko/20120615 Thunderbird/13.0.1 MIME-Version: 1.0 To: Glenn Morris Subject: Re: bug#11905: Unnecessary '#define unix' in src/s/aix4-2.h References: In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 11905 Cc: bug-gnulib , 11905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -1.9 (-) On 07/10/2012 04:25 PM, Glenn Morris wrote: > I suspect that Gnulib already has the AIX > case covered (via "__unix"?), so that src/s/aix4-2.h no longer needs to > define "unix". Yes, that sounds right. I have started to fix this by installing the following patch into gnulib, and will propagate this into Emacs shortly. --- ChangeLog | 9 +++++++++ lib/getloadavg.c | 28 +++------------------------- m4/getloadavg.m4 | 2 ++ 3 files changed, 14 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index d94f7b1..b27ef8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2012-07-10 Paul Eggert + + getloadavg: clean out old Emacs and Autoconf cruft + See Glenn Morris in . + * lib/getloadavg.c: Include , always. + Include if HAVE_SYS_PARAM_H, not if unix or __unix. + (LDAV_CVT): Remove no-longer-used LOAD_AVE_CVT hook. + * m4/getloadavg.m4 (gl_PREREQ_GETLOADAVG): Check for . + 2012-07-10 Akim Demaille bootstrap: let warn be like tests/init.sh's warn_ diff --git a/lib/getloadavg.c b/lib/getloadavg.c index 79ea717..a8ffefe 100644 --- a/lib/getloadavg.c +++ b/lib/getloadavg.c @@ -80,45 +80,23 @@ We also #define LDAV_PRIVILEGED if a program will require special installation to be able to call getloadavg. */ -/* "configure" defines CONFIGURING_GETLOADAVG to sidestep problems - with partially-configured source directories. */ - -#ifndef CONFIGURING_GETLOADAVG -# include -# include -#endif +#include /* Specification. */ #include #include +#include #include # include -/* Both the Emacs and non-Emacs sections want this. Some - configuration files' definitions for the LOAD_AVE_CVT macro (like - sparc.h's) use macros like FSCALE, defined here. */ -# if defined (unix) || defined (__unix) +# if HAVE_SYS_PARAM_H # include # endif # include "intprops.h" -/* The existing Emacs configuration files define a macro called - LOAD_AVE_CVT, which accepts a value of type LOAD_AVE_TYPE, and - returns the load average multiplied by 100. What we actually want - is a macro called LDAV_CVT, which returns the load average as an - unmultiplied double. - - For backwards compatibility, we'll define LDAV_CVT in terms of - LOAD_AVE_CVT, but future machine config files should just define - LDAV_CVT directly. */ - -# if !defined (LDAV_CVT) && defined (LOAD_AVE_CVT) -# define LDAV_CVT(n) (LOAD_AVE_CVT (n) / 100.0) -# endif - # if !defined (BSD) && defined (ultrix) /* Ultrix behaves like BSD on Vaxen. */ # define BSD diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 index 029da44..7738d2f 100644 --- a/m4/getloadavg.m4 +++ b/m4/getloadavg.m4 @@ -105,6 +105,8 @@ AC_DEFUN([gl_PREREQ_GETLOADAVG], [ # Figure out what our getloadavg.c needs. +AC_CHECK_HEADERS_ONCE([sys/param.h]) + # On HPUX9, an unprivileged user can get load averages this way. if test $gl_func_getloadavg_done = no; then AC_CHECK_FUNCS([pstat_getdynamic], [gl_func_getloadavg_done=yes]) -- 1.7.6.5 From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 10 20:07:13 2012 Received: (at 11905-done) by debbugs.gnu.org; 11 Jul 2012 00:07:13 +0000 Received: from localhost ([127.0.0.1]:60933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SokSX-0005D3-HW for submit@debbugs.gnu.org; Tue, 10 Jul 2012 20:07:13 -0400 Received: from smtp.cs.ucla.edu ([131.179.128.62]:52309) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SokSV-0005Cw-B4 for 11905-done@debbugs.gnu.org; Tue, 10 Jul 2012 20:07:11 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id CF5F9A60001; Tue, 10 Jul 2012 17:01:47 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VmuqytfsCNsW; Tue, 10 Jul 2012 17:01:47 -0700 (PDT) Received: from [192.168.1.4] (pool-108-23-119-2.lsanca.fios.verizon.net [108.23.119.2]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 85F4D39E8007; Tue, 10 Jul 2012 17:01:47 -0700 (PDT) Message-ID: <4FFCC26C.5010606@cs.ucla.edu> Date: Tue, 10 Jul 2012 17:01:48 -0700 From: Paul Eggert Organization: UCLA Computer Science Department User-Agent: Mozilla/5.0 (X11; Linux i686; rv:13.0) Gecko/20120615 Thunderbird/13.0.1 MIME-Version: 1.0 To: Glenn Morris Subject: Re: bug#11905: Unnecessary '#define unix' in src/s/aix4-2.h References: In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 11905-done Cc: 11905-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -1.9 (-) I merged the gnulib changes into Emacs as trunk bzr 109007 and am marking this as done. From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 11 03:31:36 2012 Received: (at 11905) by debbugs.gnu.org; 11 Jul 2012 07:31:36 +0000 Received: from localhost ([127.0.0.1]:32989 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SorOY-0006yx-Qg for submit@debbugs.gnu.org; Wed, 11 Jul 2012 03:31:35 -0400 Received: from mx.meyering.net ([88.168.87.75]:36076) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SorOV-0006yo-Oi for 11905@debbugs.gnu.org; Wed, 11 Jul 2012 03:31:33 -0400 Received: from rho.meyering.net (rho.meyering.net [127.0.0.1]) by rho.meyering.net (Acme Bit-Twister) with ESMTP id 700FD600A5; Wed, 11 Jul 2012 09:26:05 +0200 (CEST) From: Jim Meyering To: Paul Eggert Subject: Re: bug#11905: Unnecessary '#define unix' in src/s/aix4-2.h In-Reply-To: <4FFCC037.3050801@cs.ucla.edu> (Paul Eggert's message of "Tue, 10 Jul 2012 16:52:23 -0700") References: <4FFCC037.3050801@cs.ucla.edu> Date: Wed, 11 Jul 2012 09:26:05 +0200 Message-ID: <87y5mq69o2.fsf@rho.meyering.net> Lines: 31 MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 11905 Cc: Glenn Morris , bug-gnulib , 11905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -1.9 (-) Paul Eggert wrote: > On 07/10/2012 04:25 PM, Glenn Morris wrote: >> I suspect that Gnulib already has the AIX >> case covered (via "__unix"?), so that src/s/aix4-2.h no longer needs to >> define "unix". > > Yes, that sounds right. I have started to fix this by > installing the following patch into gnulib, and will > propagate this into Emacs shortly. > > --- > ChangeLog | 9 +++++++++ > lib/getloadavg.c | 28 +++------------------------- > m4/getloadavg.m4 | 2 ++ > 3 files changed, 14 insertions(+), 25 deletions(-) > > diff --git a/ChangeLog b/ChangeLog > index d94f7b1..b27ef8d 100644 > --- a/ChangeLog > +++ b/ChangeLog > @@ -1,3 +1,12 @@ > +2012-07-10 Paul Eggert > + > + getloadavg: clean out old Emacs and Autoconf cruft > + See Glenn Morris in . > + * lib/getloadavg.c: Include , always. > + Include if HAVE_SYS_PARAM_H, not if unix or __unix. > + (LDAV_CVT): Remove no-longer-used LOAD_AVE_CVT hook. > + * m4/getloadavg.m4 (gl_PREREQ_GETLOADAVG): Check for . Welcome clean-up. Thanks! From unknown Tue Jun 17 20:14:12 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 08 Aug 2012 11:24:03 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator