commit f36d2a2dd30368c97594923092a43dd74c61846c Author: Nicolas Vigier boklm@torproject.org Date: Sat Aug 12 20:42:59 2017 +0200

Bug 23230: Fix build error on Windows 64

Fix the following build error we have when building for Windows 64: /var/tmp/build/firefox-af0ca6a886c7/media/libcubeb/src/cubeb_wasapi.cpp:1596:46: error: cast from cubeb_devid {aka void*} to int loses precision [-fpermissive]

We fix that by using %p instead of %x to remove the need for a cast. --- media/libcubeb/src/cubeb_wasapi.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media/libcubeb/src/cubeb_wasapi.cpp b/media/libcubeb/src/cubeb_wasapi.cpp index e88d6becd861..212cc263c0b6 100644 --- a/media/libcubeb/src/cubeb_wasapi.cpp +++ b/media/libcubeb/src/cubeb_wasapi.cpp @@ -1575,7 +1575,7 @@ int setup_wasapi_stream(cubeb_stream * stm) XASSERT((!stm->output_client || !stm->input_client) && "WASAPI stream already setup, close it first.");

if (has_input(stm)) { - LOG("Setup capture: device=%x", (int)stm->input_device); + LOG("Setup capture: device=%p", stm->input_device); rv = setup_wasapi_stream_one_side(stm, &stm->input_stream_params, stm->input_device, @@ -1593,7 +1593,7 @@ int setup_wasapi_stream(cubeb_stream * stm) }

if (has_output(stm)) { - LOG("Setup render: device=%x", (int)stm->output_device); + LOG("Setup render: device=%p", stm->output_device); rv = setup_wasapi_stream_one_side(stm, &stm->output_stream_params, stm->output_device,