From owner-svn-ports-head@freebsd.org Sat Feb 6 21:25:03 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4A27D53A2BB; Sat, 6 Feb 2021 21:25:03 +0000 (UTC) (envelope-from naddy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DY50W3rz4z4g8h; Sat, 6 Feb 2021 21:24:59 +0000 (UTC) (envelope-from naddy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0B9EC186FC; Sat, 6 Feb 2021 21:24:58 +0000 (UTC) (envelope-from naddy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 116LOvWO076015; Sat, 6 Feb 2021 21:24:57 GMT (envelope-from naddy@FreeBSD.org) Received: (from naddy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 116LOvgw076014; Sat, 6 Feb 2021 21:24:57 GMT (envelope-from naddy@FreeBSD.org) Message-Id: <202102062124.116LOvgw076014@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: naddy set sender to naddy@FreeBSD.org using -f From: Christian Weisgerber Date: Sat, 6 Feb 2021 21:24:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564576 - head/news/trn4/files X-SVN-Group: ports-head X-SVN-Commit-Author: naddy X-SVN-Commit-Paths: head/news/trn4/files X-SVN-Commit-Revision: 564576 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Feb 2021 21:25:03 -0000 Author: naddy Date: Sat Feb 6 21:24:57 2021 New Revision: 564576 URL: https://svnweb.freebsd.org/changeset/ports/564576 Log: news/trn4: fix build with -fno-common Added: head/news/trn4/files/patch-scan.h (contents, props changed) Added: head/news/trn4/files/patch-scan.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/news/trn4/files/patch-scan.h Sat Feb 6 21:24:57 2021 (r564576) @@ -0,0 +1,71 @@ +--- scan.h.orig 2000-05-25 05:11:42 UTC ++++ scan.h +@@ -64,36 +64,36 @@ struct scontext { + + /* the current values */ + +-long* s_ent_sort; /* sorted list of entries in the context */ +-long s_ent_sort_max; /* maximum index of sorted array */ +-long s_ent_sorted_max; /* maximum index *that is sorted* */ +-long* s_ent_index; /* indexes into ent_sorted */ +-long s_ent_index_max; /* maximum entry number added */ ++EXT long* s_ent_sort; /* sorted list of entries in the context */ ++EXT long s_ent_sort_max; /* maximum index of sorted array */ ++EXT long s_ent_sorted_max; /* maximum index *that is sorted* */ ++EXT long* s_ent_index; /* indexes into ent_sorted */ ++EXT long s_ent_index_max; /* maximum entry number added */ + +-int s_page_size; /* number of entries allocated for page */ ++EXT int s_page_size; /* number of entries allocated for page */ + /* (usually fixed, > max screen lines) */ +-PAGE_ENT* page_ents; /* array of entries on page */ ++EXT PAGE_ENT* page_ents; /* array of entries on page */ + /* -1 means not initialized for top and bottom entry */ +-long s_top_ent; /* top entry on page */ +-long s_bot_ent; /* bottom entry (note change) */ +-bool s_refill; /* does the page need refilling? */ ++EXT long s_top_ent; /* top entry on page */ ++EXT long s_bot_ent; /* bottom entry (note change) */ ++EXT bool s_refill; /* does the page need refilling? */ + /* refresh entries */ +-bool s_ref_all; /* refresh all on page */ +-bool s_ref_top; /* top status bar */ +-bool s_ref_bot; /* bottom status bar */ ++EXT bool s_ref_all; /* refresh all on page */ ++EXT bool s_ref_top; /* top status bar */ ++EXT bool s_ref_bot; /* bottom status bar */ + /* -1 for the next two entries means don't refresh */ +-short s_ref_status; /* line to start refreshing status from */ +-short s_ref_desc; /* line to start refreshing descript. from */ ++EXT short s_ref_status; /* line to start refreshing status from */ ++EXT short s_ref_desc; /* line to start refreshing descript. from */ + /* screen sizes */ +-short s_top_lines; /* lines for top status bar */ +-short s_bot_lines; /* lines for bottom status bar */ +-short s_status_cols; /* characters for status column */ +-short s_cursor_cols; /* characters for cursor column */ +-short s_itemnum_cols; /* characters for item number column */ +-short s_desc_cols; /* characters for description column */ ++EXT short s_top_lines; /* lines for top status bar */ ++EXT short s_bot_lines; /* lines for bottom status bar */ ++EXT short s_status_cols; /* characters for status column */ ++EXT short s_cursor_cols; /* characters for cursor column */ ++EXT short s_itemnum_cols; /* characters for item number column */ ++EXT short s_desc_cols; /* characters for description column */ + /* pointer info */ +-short s_ptr_page_line; /* page_ent index */ +-long s_flags; /* misc. flags */ ++EXT short s_ptr_page_line; /* page_ent index */ ++EXT long s_flags; /* misc. flags */ + + EXT int s_num_contexts INIT(0); + /* array of context structures */ +@@ -102,7 +102,7 @@ EXT SCONTEXT* s_contexts INIT((SCONTEXT*)NULL); + /* current context number */ + EXT int s_cur_context INIT(0); + /* current context type (for fast switching) */ +-int s_cur_type; ++EXT int s_cur_type; + + /* options */ + /* show item numbers by default */