[OpenSmalltalk/opensmalltalk-vm] 3c8674: Fix slip in platforms/win32/plugins/SoundPlugin/s...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[OpenSmalltalk/opensmalltalk-vm] 3c8674: Fix slip in platforms/win32/plugins/SoundPlugin/s...

Eliot Miranda-3
 
  Branch: refs/heads/Cog
  Home:   https://github.com/OpenSmalltalk/opensmalltalk-vm
  Commit: 3c86748664c35905f35a89d8e201b364520d4c7c
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/3c86748664c35905f35a89d8e201b364520d4c7c
  Author: Eliot Miranda <[hidden email]>
  Date:   2020-12-30 (Wed, 30 Dec 2020)

  Changed paths:
    M platforms/win32/plugins/SoundPlugin/sqWin32Sound.c

  Log Message:
  -----------
  Fix slip in  platforms/win32/plugins/SoundPlugin/sqWin32Sound.c


  Commit: d2d98d47ff11a6637f6f48c10e27159c96561612
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/d2d98d47ff11a6637f6f48c10e27159c96561612
  Author: Eliot Miranda <[hidden email]>
  Date:   2021-01-05 (Tue, 05 Jan 2021)

  Changed paths:
    M build.win32x86/common/Makefile.msvc.tools
    M build.win64x64/common/Makefile.msvc.tools
    M nsspur64src/vm/cogit.h
    M nsspur64src/vm/cogitARMv8.c
    M nsspur64src/vm/cogitX64SysV.c
    M nsspur64src/vm/cogitX64WIN64.c
    M nsspursrc/vm/cogit.h
    M nsspursrc/vm/cogitARMv5.c
    M nsspursrc/vm/cogitIA32.c
    M nsspursrc/vm/cogitMIPSEL.c
    M platforms/Cross/plugins/BochsIA32Plugin/sqBochsIA32Plugin.cpp
    M platforms/Cross/plugins/BochsX64Plugin/sqBochsX64Plugin.cpp
    M platforms/Cross/plugins/DropPlugin/DropPlugin.h
    M platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c
    M platforms/iOS/vm/OSX/sqSqueakOSXApplication.m
    M platforms/iOS/vm/OSX/sqSqueakOSXDropAPI.m
    M platforms/iOS/vm/OSX/sqSqueakOSXMetalView.m
    M platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c
    M platforms/unix/vm-display-X11/sqUnixXdnd.c
    M platforms/unix/vm/sqUnixMain.c
    M platforms/win32/plugins/CameraPlugin/winCameraOps.cpp
    M platforms/win32/plugins/DropPlugin/sqWin32Drop.c
    M platforms/win32/plugins/HostWindowPlugin/sqWin32HostWindowPlugin.c
    M platforms/win32/plugins/SqueakSSL/sqWin32SSL.c
    M platforms/win32/vm/sqWin32.h
    M platforms/win32/vm/sqWin32ExternalPrims.c
    M platforms/win32/vm/sqWin32Main.c
    M platforms/win32/vm/sqWin32Prefs.c
    M platforms/win32/vm/sqWin32Utils.c
    M spur64src/vm/cogit.h
    M spur64src/vm/cogitARMv8.c
    M spur64src/vm/cogitX64SysV.c
    M spur64src/vm/cogitX64WIN64.c
    M spurlowcode64src/vm/cogit.h
    M spurlowcode64src/vm/cogitARMv8.c
    M spurlowcode64src/vm/cogitX64SysV.c
    M spurlowcode64src/vm/cogitX64WIN64.c
    M spurlowcodesrc/vm/cogit.h
    M spurlowcodesrc/vm/cogitARMv5.c
    M spurlowcodesrc/vm/cogitIA32.c
    M spurlowcodesrc/vm/cogitMIPSEL.c
    M spursista64src/vm/cogit.h
    M spursista64src/vm/cogitARMv8.c
    M spursista64src/vm/cogitX64SysV.c
    M spursista64src/vm/cogitX64WIN64.c
    M spursistasrc/vm/cogit.h
    M spursistasrc/vm/cogitARMv5.c
    M spursistasrc/vm/cogitIA32.c
    M spursistasrc/vm/cogitMIPSEL.c
    M spursrc/vm/cogit.h
    M spursrc/vm/cogitARMv5.c
    M spursrc/vm/cogitIA32.c
    M spursrc/vm/cogitMIPSEL.c
    M src/plugins/DropPlugin/DropPlugin.c
    M src/vm/cogit.h
    M src/vm/cogitARMv5.c
    M src/vm/cogitIA32.c
    M src/vm/cogitMIPSEL.c
    M src/vm/cointerp.c
    M src/vm/cointerp.h
    M src/vm/gcc3x-cointerp.c
    M stacksrc/vm/gcc3x-interp.c
    M stacksrc/vm/interp.c

  Log Message:
  -----------
  Merge branch 'Cog' of https://github.com/OpenSmalltalk/opensmalltalk-vm into Cog


Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/facfd9012e9f...d2d98d47ff11
Reply | Threaded
Open this post in threaded view
|

Re: [OpenSmalltalk/opensmalltalk-vm] 3c8674: Fix slip in platforms/win32/plugins/SoundPlugin/s...

Eliot Miranda-2
 
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.

On Tue, Jan 5, 2021 at 1:04 PM Eliot Miranda <[hidden email]> wrote:
 
  Branch: refs/heads/Cog
  Home:   https://github.com/OpenSmalltalk/opensmalltalk-vm
  Commit: 3c86748664c35905f35a89d8e201b364520d4c7c
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/3c86748664c35905f35a89d8e201b364520d4c7c
  Author: Eliot Miranda <[hidden email]>
  Date:   2020-12-30 (Wed, 30 Dec 2020)

  Changed paths:
    M platforms/win32/plugins/SoundPlugin/sqWin32Sound.c

  Log Message:
  -----------
  Fix slip in  platforms/win32/plugins/SoundPlugin/sqWin32Sound.c


  Commit: d2d98d47ff11a6637f6f48c10e27159c96561612
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/d2d98d47ff11a6637f6f48c10e27159c96561612
  Author: Eliot Miranda <[hidden email]>
  Date:   2021-01-05 (Tue, 05 Jan 2021)

  Changed paths:
    M build.win32x86/common/Makefile.msvc.tools
    M build.win64x64/common/Makefile.msvc.tools
    M nsspur64src/vm/cogit.h
    M nsspur64src/vm/cogitARMv8.c
    M nsspur64src/vm/cogitX64SysV.c
    M nsspur64src/vm/cogitX64WIN64.c
    M nsspursrc/vm/cogit.h
    M nsspursrc/vm/cogitARMv5.c
    M nsspursrc/vm/cogitIA32.c
    M nsspursrc/vm/cogitMIPSEL.c
    M platforms/Cross/plugins/BochsIA32Plugin/sqBochsIA32Plugin.cpp
    M platforms/Cross/plugins/BochsX64Plugin/sqBochsX64Plugin.cpp
    M platforms/Cross/plugins/DropPlugin/DropPlugin.h
    M platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c
    M platforms/iOS/vm/OSX/sqSqueakOSXApplication.m
    M platforms/iOS/vm/OSX/sqSqueakOSXDropAPI.m
    M platforms/iOS/vm/OSX/sqSqueakOSXMetalView.m
    M platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c
    M platforms/unix/vm-display-X11/sqUnixXdnd.c
    M platforms/unix/vm/sqUnixMain.c
    M platforms/win32/plugins/CameraPlugin/winCameraOps.cpp
    M platforms/win32/plugins/DropPlugin/sqWin32Drop.c
    M platforms/win32/plugins/HostWindowPlugin/sqWin32HostWindowPlugin.c
    M platforms/win32/plugins/SqueakSSL/sqWin32SSL.c
    M platforms/win32/vm/sqWin32.h
    M platforms/win32/vm/sqWin32ExternalPrims.c
    M platforms/win32/vm/sqWin32Main.c
    M platforms/win32/vm/sqWin32Prefs.c
    M platforms/win32/vm/sqWin32Utils.c
    M spur64src/vm/cogit.h
    M spur64src/vm/cogitARMv8.c
    M spur64src/vm/cogitX64SysV.c
    M spur64src/vm/cogitX64WIN64.c
    M spurlowcode64src/vm/cogit.h
    M spurlowcode64src/vm/cogitARMv8.c
    M spurlowcode64src/vm/cogitX64SysV.c
    M spurlowcode64src/vm/cogitX64WIN64.c
    M spurlowcodesrc/vm/cogit.h
    M spurlowcodesrc/vm/cogitARMv5.c
    M spurlowcodesrc/vm/cogitIA32.c
    M spurlowcodesrc/vm/cogitMIPSEL.c
    M spursista64src/vm/cogit.h
    M spursista64src/vm/cogitARMv8.c
    M spursista64src/vm/cogitX64SysV.c
    M spursista64src/vm/cogitX64WIN64.c
    M spursistasrc/vm/cogit.h
    M spursistasrc/vm/cogitARMv5.c
    M spursistasrc/vm/cogitIA32.c
    M spursistasrc/vm/cogitMIPSEL.c
    M spursrc/vm/cogit.h
    M spursrc/vm/cogitARMv5.c
    M spursrc/vm/cogitIA32.c
    M spursrc/vm/cogitMIPSEL.c
    M src/plugins/DropPlugin/DropPlugin.c
    M src/vm/cogit.h
    M src/vm/cogitARMv5.c
    M src/vm/cogitIA32.c
    M src/vm/cogitMIPSEL.c
    M src/vm/cointerp.c
    M src/vm/cointerp.h
    M src/vm/gcc3x-cointerp.c
    M stacksrc/vm/gcc3x-interp.c
    M stacksrc/vm/interp.c

  Log Message:
  -----------
  Merge branch 'Cog' of https://github.com/OpenSmalltalk/opensmalltalk-vm into Cog


Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/facfd9012e9f...d2d98d47ff11


--
_,,,^..^,,,_
best, Eliot
Reply | Threaded
Open this post in threaded view
|

Re: [OpenSmalltalk/opensmalltalk-vm] 3c8674: Fix slip in platforms/win32/plugins/SoundPlugin/s...

Nicolas Cellier
 
Hi Eliot,
no problem, I stepped on your feet with this quick fix for the sake of
maintaining the builds green, I don't want to slow down your work.

Le mar. 5 janv. 2021 à 22:07, Eliot Miranda <[hidden email]> a écrit :

>
>
> 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.
>
> On Tue, Jan 5, 2021 at 1:04 PM Eliot Miranda <[hidden email]> wrote:
>>
>>
>>   Branch: refs/heads/Cog
>>   Home:   https://github.com/OpenSmalltalk/opensmalltalk-vm
>>   Commit: 3c86748664c35905f35a89d8e201b364520d4c7c
>>       https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/3c86748664c35905f35a89d8e201b364520d4c7c
>>   Author: Eliot Miranda <[hidden email]>
>>   Date:   2020-12-30 (Wed, 30 Dec 2020)
>>
>>   Changed paths:
>>     M platforms/win32/plugins/SoundPlugin/sqWin32Sound.c
>>
>>   Log Message:
>>   -----------
>>   Fix slip in  platforms/win32/plugins/SoundPlugin/sqWin32Sound.c
>>
>>
>>   Commit: d2d98d47ff11a6637f6f48c10e27159c96561612
>>       https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/d2d98d47ff11a6637f6f48c10e27159c96561612
>>   Author: Eliot Miranda <[hidden email]>
>>   Date:   2021-01-05 (Tue, 05 Jan 2021)
>>
>>   Changed paths:
>>     M build.win32x86/common/Makefile.msvc.tools
>>     M build.win64x64/common/Makefile.msvc.tools
>>     M nsspur64src/vm/cogit.h
>>     M nsspur64src/vm/cogitARMv8.c
>>     M nsspur64src/vm/cogitX64SysV.c
>>     M nsspur64src/vm/cogitX64WIN64.c
>>     M nsspursrc/vm/cogit.h
>>     M nsspursrc/vm/cogitARMv5.c
>>     M nsspursrc/vm/cogitIA32.c
>>     M nsspursrc/vm/cogitMIPSEL.c
>>     M platforms/Cross/plugins/BochsIA32Plugin/sqBochsIA32Plugin.cpp
>>     M platforms/Cross/plugins/BochsX64Plugin/sqBochsX64Plugin.cpp
>>     M platforms/Cross/plugins/DropPlugin/DropPlugin.h
>>     M platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c
>>     M platforms/iOS/vm/OSX/sqSqueakOSXApplication.m
>>     M platforms/iOS/vm/OSX/sqSqueakOSXDropAPI.m
>>     M platforms/iOS/vm/OSX/sqSqueakOSXMetalView.m
>>     M platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c
>>     M platforms/unix/vm-display-X11/sqUnixXdnd.c
>>     M platforms/unix/vm/sqUnixMain.c
>>     M platforms/win32/plugins/CameraPlugin/winCameraOps.cpp
>>     M platforms/win32/plugins/DropPlugin/sqWin32Drop.c
>>     M platforms/win32/plugins/HostWindowPlugin/sqWin32HostWindowPlugin.c
>>     M platforms/win32/plugins/SqueakSSL/sqWin32SSL.c
>>     M platforms/win32/vm/sqWin32.h
>>     M platforms/win32/vm/sqWin32ExternalPrims.c
>>     M platforms/win32/vm/sqWin32Main.c
>>     M platforms/win32/vm/sqWin32Prefs.c
>>     M platforms/win32/vm/sqWin32Utils.c
>>     M spur64src/vm/cogit.h
>>     M spur64src/vm/cogitARMv8.c
>>     M spur64src/vm/cogitX64SysV.c
>>     M spur64src/vm/cogitX64WIN64.c
>>     M spurlowcode64src/vm/cogit.h
>>     M spurlowcode64src/vm/cogitARMv8.c
>>     M spurlowcode64src/vm/cogitX64SysV.c
>>     M spurlowcode64src/vm/cogitX64WIN64.c
>>     M spurlowcodesrc/vm/cogit.h
>>     M spurlowcodesrc/vm/cogitARMv5.c
>>     M spurlowcodesrc/vm/cogitIA32.c
>>     M spurlowcodesrc/vm/cogitMIPSEL.c
>>     M spursista64src/vm/cogit.h
>>     M spursista64src/vm/cogitARMv8.c
>>     M spursista64src/vm/cogitX64SysV.c
>>     M spursista64src/vm/cogitX64WIN64.c
>>     M spursistasrc/vm/cogit.h
>>     M spursistasrc/vm/cogitARMv5.c
>>     M spursistasrc/vm/cogitIA32.c
>>     M spursistasrc/vm/cogitMIPSEL.c
>>     M spursrc/vm/cogit.h
>>     M spursrc/vm/cogitARMv5.c
>>     M spursrc/vm/cogitIA32.c
>>     M spursrc/vm/cogitMIPSEL.c
>>     M src/plugins/DropPlugin/DropPlugin.c
>>     M src/vm/cogit.h
>>     M src/vm/cogitARMv5.c
>>     M src/vm/cogitIA32.c
>>     M src/vm/cogitMIPSEL.c
>>     M src/vm/cointerp.c
>>     M src/vm/cointerp.h
>>     M src/vm/gcc3x-cointerp.c
>>     M stacksrc/vm/gcc3x-interp.c
>>     M stacksrc/vm/interp.c
>>
>>   Log Message:
>>   -----------
>>   Merge branch 'Cog' of https://github.com/OpenSmalltalk/opensmalltalk-vm into Cog
>>
>>
>> Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/facfd9012e9f...d2d98d47ff11
>
>
>
> --
> _,,,^..^,,,_
> best, Eliot