[pkgsrc/trunk]: pkgsrc/emulators/snes9x snes9x: Avoid colliding with libc fun...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e61a3f38524d
branches:  trunk
changeset: 389625:e61a3f38524d
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri Jan 04 23:34:36 2019 +0000

description:
snes9x: Avoid colliding with libc functions properly.

diffstat:

 emulators/snes9x/distinfo                    |  4 ++--
 emulators/snes9x/patches/patch-unix_unix.cpp |  8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (50 lines):

diff -r ba21e62264b8 -r e61a3f38524d emulators/snes9x/distinfo
--- a/emulators/snes9x/distinfo Fri Jan 04 23:17:06 2019 +0000
+++ b/emulators/snes9x/distinfo Fri Jan 04 23:34:36 2019 +0000
@@ -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
diff -r ba21e62264b8 -r e61a3f38524d emulators/snes9x/patches/patch-unix_unix.cpp
--- a/emulators/snes9x/patches/patch-unix_unix.cpp      Fri Jan 04 23:17:06 2019 +0000
+++ b/emulators/snes9x/patches/patch-unix_unix.cpp      Fri Jan 04 23:34:36 2019 +0000
@@ -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 @@
  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 @@
  }
  
 -static long log2 (long num)
-+static long log2l (long num)
++static long log2_l (long num)
  {
        long    n = 0;
  
@@ -27,7 +27,7 @@
        }
  
 -      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);