From nobody Wed Apr 13 09:37:16 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A9ECB1B03980; Wed, 13 Apr 2022 09:37:16 +0000 (UTC) (envelope-from git@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 4Kdcv04PvKz4s5v; Wed, 13 Apr 2022 09:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649842636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HzhGPPsY5N/as7GOCGgouvn8FK6KJpvaMILOFGHRTjI=; b=Imse0yBxwOOo+peSrItatxSuyw1yCxzRVanhoM3cqLlAxsvWFy2NUKVXlfHzTXgDnDs0XV xPCKoA+A2nDUSCZ4wi0wOFYcwCODy5Kx1ifZeGxl3KsQsgJ1kGUOd2QCSZJw+pNKQGEe1d g/NMVI2YS/I5XdH5fH71TSiZ8p17fh1ixKcCE63swTEggFKfXJ44+9it9UG4Z6C7mUhd9k yfufDi6ZBodD6sj49bXqnLlkwoq7bg5+C+xJUg9SIeED+4fZcJ+v2jLtAKGAMEQMYRG2Ea +rxnMjxVBhbfsCqJfxAz9fc4tKGCTiLKbXcz/e2fRglHgMFIdCMUMiOuqNfJ+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 78103159C; Wed, 13 Apr 2022 09:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23D9bG4G079067; Wed, 13 Apr 2022 09:37:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23D9bGPs079066; Wed, 13 Apr 2022 09:37:16 GMT (envelope-from git) Date: Wed, 13 Apr 2022 09:37:16 GMT Message-Id: <202204130937.23D9bGPs079066@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: ae18d76d618d - main - sc: Move prev_ysize under #ifndef SC_NO_HISTORY List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae18d76d618d93c298664e5f3b1cf1f31a47dafb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649842636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HzhGPPsY5N/as7GOCGgouvn8FK6KJpvaMILOFGHRTjI=; b=GgTLl2eV0YsWNxrjeHcmnevN7fPYhRqckckHNL8cmrmt0c7aH4PvXFiSYeeT9rZD/doAwE STRTk0bnMR65ET8whAq6eaC/UIk3n0Rydep1Y40ryJnO9jkcw0wkP4Maav6IBni3bie8hY vvy4eB+de/M4Dc73LKrIwqZEsKRETZRyNip6obdFN2MgjM+M71C9YD2rbM6lOhjEF0Xe7c 0BvhAXcO9KrBVqa04estnTHErIyeHBfFW9irdxOBEdWUlTwxFCBQt3cpzfVofywGrS9Yrx XHXs5LwBi2y4JXgot8rjS85mawmGz7yiXrI7dEgevhrDGxJE7zAYcYGa/tUA0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649842636; a=rsa-sha256; cv=none; b=p8xJpX4mpxhDkWohnBj28A0hKfLHMjRrEb0IKEShQjMMHIRvU/NXA63qsuDAoMOPWGzdzF f+yrWGDzfCCMMYsgx2RdbAiVScnN9yNi1urRRf33dt4YRVIrNek8RzUSnEJa6/fuv7qVWm HUNmxpEUEYarOSEd5ADJs+NSq4dKh06gsa4GmKVSFlW3DH3MFx11U0NNOGxkmSnxim0uAS oJjE6d+mmWFapXLm+X8G5jw2ImcJp2b+u/degQ6zIY3kvyb6itnzXj8wdHIYDB1sd1EIxH K4toJQNKQnPowfMkC10SF1JIaOzkVv9i/11pGne4XON6gpMNdDQFlXyV2Lhp3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=ae18d76d618d93c298664e5f3b1cf1f31a47dafb commit ae18d76d618d93c298664e5f3b1cf1f31a47dafb Author: Dmitry Chagin AuthorDate: 2022-04-13 09:35:55 +0000 Commit: Dmitry Chagin CommitDate: 2022-04-13 09:35:55 +0000 sc: Move prev_ysize under #ifndef SC_NO_HISTORY Finish fdf288f39. --- sys/dev/syscons/scvidctl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c index 222ed253c3ee..a4ab6d034181 100644 --- a/sys/dev/syscons/scvidctl.c +++ b/sys/dev/syscons/scvidctl.c @@ -315,7 +315,9 @@ sc_set_pixel_mode(scr_stat *scp, struct tty *tp, int xsize, int ysize, video_info_t info; struct winsize wsz; u_char *font; +#ifndef SC_NO_HISTORY int prev_ysize; +#endif int error; int s;