From unknown Sat Aug 16 19:59:52 2025 X-Loop: help-debbugs@gnu.org Subject: bug#6382: 24.0.50; Fix build on platforms including s/usg5-4.h after BSTRING change Resent-From: Lawrence Mitchell Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 09 Jun 2010 11:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 6382 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 6382@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.127608398127180 (code B ref -1); Wed, 09 Jun 2010 11:47:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Jun 2010 11:46:21 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OMJjg-00074L-Tt for submit@debbugs.gnu.org; Wed, 09 Jun 2010 07:46:21 -0400 Received: from mail.gnu.org ([199.232.76.166] helo=mx10.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OMJjf-00074A-LB for submit@debbugs.gnu.org; Wed, 09 Jun 2010 07:46:20 -0400 Received: from lists.gnu.org ([199.232.76.165]:37057) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1OMJjY-0004JE-RD for submit@debbugs.gnu.org; Wed, 09 Jun 2010 07:46:13 -0400 Received: from [140.186.70.92] (port=38436 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OMJHt-000066-PV for bug-gnu-emacs@gnu.org; Wed, 09 Jun 2010 07:17:44 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_RP_MATCHES_RCVD, T_TO_NO_BRKTS_FREEMAIL autolearn=unavailable version=3.3.1 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OMJHD-0004vK-Iz for bug-gnu-emacs@gnu.org; Wed, 09 Jun 2010 07:17:01 -0400 Received: from e450.epcc.ed.ac.uk ([129.215.56.230]:44062) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OMJHD-0004r8-3J for bug-gnu-emacs@gnu.org; Wed, 09 Jun 2010 07:16:55 -0400 Received: from garnet.epcc.ed.ac.uk (garnet.epcc.ed.ac.uk [129.215.56.222]) by e450.epcc.ed.ac.uk (8.13.6/8.13.6) with ESMTP id o59BGkPj003537 for ; Wed, 9 Jun 2010 12:16:46 +0100 (BST) Received: from garnet.epcc.ed.ac.uk (localhost [127.0.0.1]) by garnet.epcc.ed.ac.uk (8.13.8+Sun/8.12.8) with ESMTP id o59BEJYG026999 for ; Wed, 9 Jun 2010 12:14:19 +0100 (BST) Received: (from lmitche4@localhost) by garnet.epcc.ed.ac.uk (8.13.8+Sun/8.13.8/Submit) id o59BEJwP026996; Wed, 9 Jun 2010 12:14:19 +0100 (BST) X-Authentication-Warning: garnet.epcc.ed.ac.uk: lmitche4 set sender to lawrence.mitchell@ed.ac.uk using -f From: Lawrence Mitchell Date: Wed, 09 Jun 2010 12:14:19 +0100 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Edinburgh-Scanned: at mailhost.epcc.ed.ac.uk X-Scanned-By: MIMEDefang 2.33 (www . roaringpenguin . com / mimedefang) X-detected-operating-system: by eggs.gnu.org: Solaris 8 (1) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Spam-Score: -5.5 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 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: -5.6 (-----) This change: 2010-06-06 Dan Nicolaescu Remove BSTRING related code, all platforms define it. Breaks builds on systems that include src/s/usg5-4.h. The patch below fixes things. Cheers, Lawrence 2010-6-09 Lawrence Mitchell * s/usg5-4.h: Remove spurious #ifdef HAVE_X_WINDOWS. diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h index b3518d7..e667ffd 100644 --- a/src/s/usg5-4.h +++ b/src/s/usg5-4.h @@ -61,9 +61,6 @@ along with GNU Emacs. If not, see . */ /* The docs for system V/386 suggest v.3 has sigpause, so let's try it. */ #define HAVE_SYSV_SIGPAUSE -/* If we're using the System V X port, BSD bstring functions will be handy. */ -#ifdef HAVE_X_WINDOWS - /* On USG systems signal handlers return void. */ #define SIGTYPE void From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 11 00:33:54 2010 Received: (at control) by debbugs.gnu.org; 11 Jun 2010 04:33:54 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OMvwI-0002Ct-G4 for submit@debbugs.gnu.org; Fri, 11 Jun 2010 00:33:54 -0400 Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OMvwG-0002Ci-Uo for control@debbugs.gnu.org; Fri, 11 Jun 2010 00:33:53 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1OMvwC-0001Jk-JJ; Fri, 11 Jun 2010 00:33:48 -0400 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <19473.48300.528727.457348@fencepost.gnu.org> Date: Fri, 11 Jun 2010 00:33:48 -0400 From: Glenn Morris To: control Subject: control X-Attribution: GM X-Mailer: VM (www.wonderworks.com/vm), GNU Emacs (www.gnu.org/software/emacs) X-Hue: cyan X-Ran: ibWh?tot29edhXmqVU'.J\|6IH;9A<8eczZ/-A=:'soF~@q&C?+$:Bz=>D?@LUfs\(a}NS X-Debbugs-No-Ack: yes X-Spam-Score: -5.1 (-----) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 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: -5.1 (-----) close 6382