Received: by mail.netbsd.org (Postfix, from userid 605) id 3E9A084E36; Fri, 4 Jan 2019 23:34:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 914B984E2E for ; Fri, 4 Jan 2019 23:34:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id Ytj3D-OfQLO8 for ; Fri, 4 Jan 2019 23:34:38 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 0E33A84D04 for ; Fri, 4 Jan 2019 23:34:38 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B59FFFB16; Fri, 4 Jan 2019 23:34:36 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1546644876208080" MIME-Version: 1.0 Date: Fri, 4 Jan 2019 23:34:36 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/emulators/snes9x To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20190104233436.B59FFFB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1546644876208080 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Fri Jan 4 23:34:36 UTC 2019 Modified Files: pkgsrc/emulators/snes9x: distinfo pkgsrc/emulators/snes9x/patches: patch-unix_unix.cpp Log Message: snes9x: Avoid colliding with libc functions properly. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 pkgsrc/emulators/snes9x/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/snes9x/patches/patch-unix_unix.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1546644876208080 Content-Disposition: inline Content-Length: 2300 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/emulators/snes9x/distinfo diff -u pkgsrc/emulators/snes9x/distinfo:1.21 pkgsrc/emulators/snes9x/distinfo:1.22 --- pkgsrc/emulators/snes9x/distinfo:1.21 Wed Jan 2 11:25:32 2019 +++ pkgsrc/emulators/snes9x/distinfo Fri Jan 4 23:34:36 2019 @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.21 2019/01/02 11:25:32 nia Exp $ +$NetBSD: distinfo,v 1.22 2019/01/04 23:34:36 nia Exp $ SHA1 (snes9x-1.58.tar.gz) = c94ceb8d7b322b4bfa030b1327d815b697e4176a RMD160 (snes9x-1.58.tar.gz) = 51f7fe17f003998b35204046ca7d193d37980da1 SHA512 (snes9x-1.58.tar.gz) = 51f8e92258db58e55f7b0b6c4537a916358891bb5ee35bd984d1970d2fedbdb2f8b3a4f560e0302d3011e521a1072c8a0d69723e8b151f61d33802c02f392d7d Size (snes9x-1.58.tar.gz) = 2830667 bytes SHA1 (patch-unix_configure) = 9df9a805141396583bceb35bea1bda157ed3ed6b -SHA1 (patch-unix_unix.cpp) = 96089e2cc990a1b6bb83b94c3509957f91fd046a +SHA1 (patch-unix_unix.cpp) = a78882348d28f091863c75ea50e853369c8762a1 Index: pkgsrc/emulators/snes9x/patches/patch-unix_unix.cpp diff -u pkgsrc/emulators/snes9x/patches/patch-unix_unix.cpp:1.1 pkgsrc/emulators/snes9x/patches/patch-unix_unix.cpp:1.2 --- pkgsrc/emulators/snes9x/patches/patch-unix_unix.cpp:1.1 Wed Jan 2 11:25:32 2019 +++ pkgsrc/emulators/snes9x/patches/patch-unix_unix.cpp Fri Jan 4 23:34:36 2019 @@ -1,4 +1,4 @@ -$NetBSD: patch-unix_unix.cpp,v 1.1 2019/01/02 11:25:32 nia Exp $ +$NetBSD: patch-unix_unix.cpp,v 1.2 2019/01/04 23:34:36 nia Exp $ Avoid colliding with libc functions. @@ -9,7 +9,7 @@ Avoid colliding with libc functions. bool S9xDisplayPollPointer (uint32, int16 *, int16 *); -static long log2 (long); -+static long log2l (long); ++static long log2_l (long); static void SoundTrigger (void); static void InitTimer (void); static void NSRTControllerSetup (void); @@ -18,7 +18,7 @@ Avoid colliding with libc functions. } -static long log2 (long num) -+static long log2l (long num) ++static long log2_l (long num) { long n = 0; @@ -27,7 +27,7 @@ Avoid colliding with libc functions. } - J = log2(unixSettings.SoundFragmentSize) | (3 << 16); -+ J = log2l(unixSettings.SoundFragmentSize) | (3 << 16); ++ J = log2_l(unixSettings.SoundFragmentSize) | (3 << 16); if (ioctl(so.sound_fd, SNDCTL_DSP_SETFRAGMENT, &J) == -1) return (FALSE); --_----------=_1546644876208080--