From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.bugs Subject: bug#18238: Fix for DOS build when using more accurate config[.h].in Date: Fri, 22 Oct 2021 15:02:17 -0400 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="36635"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: 18238@debbugs.gnu.org To: Reuben Thomas Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Oct 22 21:03:21 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mdzp3-0009Kd-8c for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 22 Oct 2021 21:03:21 +0200 Original-Received: from localhost ([::1]:40218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mdzp1-0006JP-7J for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 22 Oct 2021 15:03:19 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:45070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mdzom-0006HP-EV for bug-gnu-emacs@gnu.org; Fri, 22 Oct 2021 15:03:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:50470) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mdzol-0003pd-5u for bug-gnu-emacs@gnu.org; Fri, 22 Oct 2021 15:03:04 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mdzol-0004LA-3D for bug-gnu-emacs@gnu.org; Fri, 22 Oct 2021 15:03:03 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 22 Oct 2021 19:03:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18238 X-GNU-PR-Package: emacs Original-Received: via spool by 18238-submit@debbugs.gnu.org id=B18238.163492934816600 (code B ref 18238); Fri, 22 Oct 2021 19:03:03 +0000 Original-Received: (at 18238) by debbugs.gnu.org; 22 Oct 2021 19:02:28 +0000 Original-Received: from localhost ([127.0.0.1]:33779 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mdzoB-0004Jg-Vj for submit@debbugs.gnu.org; Fri, 22 Oct 2021 15:02:28 -0400 Original-Received: from mail-pj1-f50.google.com ([209.85.216.50]:35348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mdzo8-0004JO-6B for 18238@debbugs.gnu.org; Fri, 22 Oct 2021 15:02:26 -0400 Original-Received: by mail-pj1-f50.google.com with SMTP id n11-20020a17090a2bcb00b001a1e7a0a6a6so2729399pje.0 for <18238@debbugs.gnu.org>; Fri, 22 Oct 2021 12:02:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:in-reply-to:references:user-agent :mime-version:date:message-id:subject:to:cc; bh=GW9oTZvpDorPg8uaTmJubsRP+omxLeZrwp1/6sqQxLY=; b=1EW2bx/M2TpHSfEIZuuSGQY/gBzCxI+rrq4suCwKovUVM648BSM09ylGs++1v3uhdq hOfKjcECgS2p2B0ruDkuRsqOEYEaTM1QxfuN0h73NbOQZXe/pxeVzoiw0wb4As//Urkd +iyeIHN6F2PQuRM2eXWUjcMrN7UOjxg+enFTY2YKTOoWi9I1I2XC+Keq+TDra4vgZC9M zIbbu1PO2OI8tU+9M5f+xCt2dLsxbrNWcIhp8HU62/b3PGzZctlZxMb/tsv+WUQY4bsD ZPVT0lmYff47cel71wUhEmPVClQ2BuPjLS/RrKqSq1dtUUHwKs7pVzy+Ov77VdPYmUlk RkoA== X-Gm-Message-State: AOAM533VS2yHzpydOyVPQXSuDj4y/Ytduk0vJaLeOjiWkf9zHUbaW11N mawG/4zFIEFv9MTyFo4N7KNbR/qs33XgYt4WE+w= X-Google-Smtp-Source: ABdhPJx8ibfsqN31PCzRcST+vXXWELDmm7rBCm3YJyj/fpjYDpDJ9xstJkpDWmv3qoT2KE+N9RkDnBeOV7zcW3d/0rk= X-Received: by 2002:a17:90b:17d2:: with SMTP id me18mr16583185pjb.132.1634929338183; Fri, 22 Oct 2021 12:02:18 -0700 (PDT) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Fri, 22 Oct 2021 15:02:17 -0400 In-Reply-To: (Reuben Thomas's message of "Sun, 10 Aug 2014 17:47:11 +0100") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:217910 Archived-At: Reuben Thomas writes: > DJGPP does actually have getrlimit. The special config[.h].in for MSDOS lies and says it hasn't. However, this is a white lie, because > getrlimit on DJGPP doesn't support RLIMIT_AS/RLIMIT_DATA, which is what we want, so we still want the workaround code. The following > patch simply reverses the order of a couple of tests in vm-limit.c so that being on MSDOS overrides HAVE_GETRLIMIT. > > Is it OK to install? (That was in 2014.) It seems like this patch was never installed. Is it still relevant? > === modified file 'src/vm-limit.c' > --- src/vm-limit.c 2014-07-11 10:09:51 +0000 > +++ src/vm-limit.c 2014-08-10 16:44:24 +0000 > @@ -71,7 +71,27 @@ > /* Number of bytes of writable memory we can expect to be able to get. */ > static size_t lim_data; > > > -#ifdef HAVE_GETRLIMIT > +#ifdef MSDOS > + > +void > +get_lim_data (void) > +{ > + unsigned long totalram, freeram, totalswap, freeswap; > + > + dos_memory_info (&totalram, &freeram, &totalswap, &freeswap); > + lim_data = freeram; > + /* Don't believe they will give us more that 0.5 GB. */ > + if (lim_data > 512U * 1024U * 1024U) > + lim_data = 512U * 1024U * 1024U; > +} > + > +unsigned long > +ret_lim_data (void) > +{ > + get_lim_data (); > + return lim_data; > +} > +#elif defined HAVE_GETRLIMIT > > # ifndef RLIMIT_AS > # define RLIMIT_AS RLIMIT_DATA > @@ -101,26 +121,6 @@ > lim_data = reserved_heap_size; > } > > -#elif defined MSDOS > - > -void > -get_lim_data (void) > -{ > - unsigned long totalram, freeram, totalswap, freeswap; > - > - dos_memory_info (&totalram, &freeram, &totalswap, &freeswap); > - lim_data = freeram; > - /* Don't believe they will give us more that 0.5 GB. */ > - if (lim_data > 512U * 1024U * 1024U) > - lim_data = 512U * 1024U * 1024U; > -} > - > -unsigned long > -ret_lim_data (void) > -{ > - get_lim_data (); > - return lim_data; > -} > #else > # error "get_lim_data not implemented on this machine" > #endif