<div dir="ltr"><div class="gmail_default" style="font-size:small">Ugh, sorry Nicolas, I didn't mean to squash your commit.  I meant to squash mine.  I had fixed the same issue as you had with that macro but forgot to push.  To day I got my merge wrong.  So apologies if this seems like some passive aggressive bullshit.  It's actually git incompetence on my part.<br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, Jan 5, 2021 at 1:04 PM Eliot Miranda <<a href="mailto:noreply@github.com">noreply@github.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex"> <br>
  Branch: refs/heads/Cog<br>
  Home:   <a href="https://github.com/OpenSmalltalk/opensmalltalk-vm" rel="noreferrer" target="_blank">https://github.com/OpenSmalltalk/opensmalltalk-vm</a><br>
  Commit: 3c86748664c35905f35a89d8e201b364520d4c7c<br>
      <a href="https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/3c86748664c35905f35a89d8e201b364520d4c7c" rel="noreferrer" target="_blank">https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/3c86748664c35905f35a89d8e201b364520d4c7c</a><br>
  Author: Eliot Miranda <<a href="mailto:eliot.miranda@gmail.com" target="_blank">eliot.miranda@gmail.com</a>><br>
  Date:   2020-12-30 (Wed, 30 Dec 2020)<br>
<br>
  Changed paths:<br>
    M platforms/win32/plugins/SoundPlugin/sqWin32Sound.c<br>
<br>
  Log Message:<br>
  -----------<br>
  Fix slip in  platforms/win32/plugins/SoundPlugin/sqWin32Sound.c<br>
<br>
<br>
  Commit: d2d98d47ff11a6637f6f48c10e27159c96561612<br>
      <a href="https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/d2d98d47ff11a6637f6f48c10e27159c96561612" rel="noreferrer" target="_blank">https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/d2d98d47ff11a6637f6f48c10e27159c96561612</a><br>
  Author: Eliot Miranda <<a href="mailto:eliot.miranda@gmail.com" target="_blank">eliot.miranda@gmail.com</a>><br>
  Date:   2021-01-05 (Tue, 05 Jan 2021)<br>
<br>
  Changed paths:<br>
    M build.win32x86/common/Makefile.msvc.tools<br>
    M build.win64x64/common/Makefile.msvc.tools<br>
    M nsspur64src/vm/cogit.h<br>
    M nsspur64src/vm/cogitARMv8.c<br>
    M nsspur64src/vm/cogitX64SysV.c<br>
    M nsspur64src/vm/cogitX64WIN64.c<br>
    M nsspursrc/vm/cogit.h<br>
    M nsspursrc/vm/cogitARMv5.c<br>
    M nsspursrc/vm/cogitIA32.c<br>
    M nsspursrc/vm/cogitMIPSEL.c<br>
    M platforms/Cross/plugins/BochsIA32Plugin/sqBochsIA32Plugin.cpp<br>
    M platforms/Cross/plugins/BochsX64Plugin/sqBochsX64Plugin.cpp<br>
    M platforms/Cross/plugins/DropPlugin/DropPlugin.h<br>
    M platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c<br>
    M platforms/iOS/vm/OSX/sqSqueakOSXApplication.m<br>
    M platforms/iOS/vm/OSX/sqSqueakOSXDropAPI.m<br>
    M platforms/iOS/vm/OSX/sqSqueakOSXMetalView.m<br>
    M platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c<br>
    M platforms/unix/vm-display-X11/sqUnixXdnd.c<br>
    M platforms/unix/vm/sqUnixMain.c<br>
    M platforms/win32/plugins/CameraPlugin/winCameraOps.cpp<br>
    M platforms/win32/plugins/DropPlugin/sqWin32Drop.c<br>
    M platforms/win32/plugins/HostWindowPlugin/sqWin32HostWindowPlugin.c<br>
    M platforms/win32/plugins/SqueakSSL/sqWin32SSL.c<br>
    M platforms/win32/vm/sqWin32.h<br>
    M platforms/win32/vm/sqWin32ExternalPrims.c<br>
    M platforms/win32/vm/sqWin32Main.c<br>
    M platforms/win32/vm/sqWin32Prefs.c<br>
    M platforms/win32/vm/sqWin32Utils.c<br>
    M spur64src/vm/cogit.h<br>
    M spur64src/vm/cogitARMv8.c<br>
    M spur64src/vm/cogitX64SysV.c<br>
    M spur64src/vm/cogitX64WIN64.c<br>
    M spurlowcode64src/vm/cogit.h<br>
    M spurlowcode64src/vm/cogitARMv8.c<br>
    M spurlowcode64src/vm/cogitX64SysV.c<br>
    M spurlowcode64src/vm/cogitX64WIN64.c<br>
    M spurlowcodesrc/vm/cogit.h<br>
    M spurlowcodesrc/vm/cogitARMv5.c<br>
    M spurlowcodesrc/vm/cogitIA32.c<br>
    M spurlowcodesrc/vm/cogitMIPSEL.c<br>
    M spursista64src/vm/cogit.h<br>
    M spursista64src/vm/cogitARMv8.c<br>
    M spursista64src/vm/cogitX64SysV.c<br>
    M spursista64src/vm/cogitX64WIN64.c<br>
    M spursistasrc/vm/cogit.h<br>
    M spursistasrc/vm/cogitARMv5.c<br>
    M spursistasrc/vm/cogitIA32.c<br>
    M spursistasrc/vm/cogitMIPSEL.c<br>
    M spursrc/vm/cogit.h<br>
    M spursrc/vm/cogitARMv5.c<br>
    M spursrc/vm/cogitIA32.c<br>
    M spursrc/vm/cogitMIPSEL.c<br>
    M src/plugins/DropPlugin/DropPlugin.c<br>
    M src/vm/cogit.h<br>
    M src/vm/cogitARMv5.c<br>
    M src/vm/cogitIA32.c<br>
    M src/vm/cogitMIPSEL.c<br>
    M src/vm/cointerp.c<br>
    M src/vm/cointerp.h<br>
    M src/vm/gcc3x-cointerp.c<br>
    M stacksrc/vm/gcc3x-interp.c<br>
    M stacksrc/vm/interp.c<br>
<br>
  Log Message:<br>
  -----------<br>
  Merge branch 'Cog' of <a href="https://github.com/OpenSmalltalk/opensmalltalk-vm" rel="noreferrer" target="_blank">https://github.com/OpenSmalltalk/opensmalltalk-vm</a> into Cog<br>
<br>
<br>
Compare: <a href="https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/facfd9012e9f...d2d98d47ff11" rel="noreferrer" target="_blank">https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/facfd9012e9f...d2d98d47ff11</a><br>
</blockquote></div><br clear="all"><div><br></div>-- <br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div><span style="font-size:small;border-collapse:separate"><div>_,,,^..^,,,_<br></div><div>best, Eliot</div></span></div></div></div>