Bug 1393896 Detect Windows using WIN32 instead of _MSC_VER which is not set under MinGW draft
authorTom Ritter <tom@mozilla.com>
Fri, 25 Aug 2017 13:46:39 -0500
changeset 653229 1b215af12600f0593a7e00daececc7d5bbc06611
parent 653228 3e8812e44cde87ab610d5ad47906be37d343820c
child 653230 5d431ab3507048b5d8cd6fd29a53967996957efd
push id76269
push userbmo:tom@mozilla.com
push dateFri, 25 Aug 2017 18:50:14 +0000
bugs1393896
milestone57.0a1
Bug 1393896 Detect Windows using WIN32 instead of _MSC_VER which is not set under MinGW MozReview-Commit-ID: METjBDU8gu
media/mtransport/third_party/nrappkit/src/log/r_log.c
media/mtransport/third_party/nrappkit/src/registry/registry.c
--- a/media/mtransport/third_party/nrappkit/src/log/r_log.c
+++ b/media/mtransport/third_party/nrappkit/src/log/r_log.c
@@ -44,17 +44,17 @@ static char *RCSSTRING __UNUSED__ ="$Id:
 #define _BSD_SOURCE
 #endif
 
 #include "r_log.h"
 #include "hex.h"
 
 #include <string.h>
 #include <errno.h>
-#ifndef _MSC_VER
+#ifndef WIN32
 #include <strings.h>
 #include <syslog.h>
 #endif
 #include <registry.h>
 #include <time.h>
 
 
 #include "nr_common.h"
old mode 100644
new mode 100755
--- a/media/mtransport/third_party/nrappkit/src/registry/registry.c
+++ b/media/mtransport/third_party/nrappkit/src/registry/registry.c
@@ -39,17 +39,17 @@
  *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *    POSSIBILITY OF SUCH DAMAGE.
  *
  *
  */
 
 #include <assert.h>
 #include <string.h>
-#ifndef _MSC_VER
+#ifndef WIN32
 #include <strings.h>
 #include <sys/param.h>
 #include <netinet/in.h>
 #endif
 #ifdef OPENSSL
 #include <openssl/ssl.h>
 #endif
 #include <ctype.h>