[gjs: 6/6] Merge branch 'master.msvc' into 'master'

[Philip Chimento <pchimento src gnome org>]

commit 7abec01e21459ddb3e4735942bcb4889b5853634
Merge: dc9e63b3 670ade7c
Author: Philip Chimento <philip chimento gmail com>
Date:   Mon Jul 12 23:52:02 2021 +0000

    Merge branch 'master.msvc' into 'master'
    
    Fix builds on Windows/Visual Studio with the latest GIT master
    
    See merge request GNOME/gjs!639

 README.MSVC.md        | 7 +++++++
 gjs/context.cpp       | 1 -
 gjs/engine.cpp        | 1 -
 gjs/gjs_pch.hh        | 4 ++--
 gjs/importer.cpp      | 1 -
 gjs/jsapi-util.cpp    | 1 -
 gjs/text-encoding.cpp | 7 ++++---
 meson.build           | 3 +--
 8 files changed, 14 insertions(+), 11 deletions(-)
---