From 46dbc7157d708c1fcf0ad21843e470d7d115d8f6 Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Mon, 1 Feb 2010 06:41:17 -0500
Subject: [PATCH] Redo MingW ifdefs to also work on generic WIN32, MSVC++

---
 src/V3File.cpp    | 4 ++--
 src/V3Options.cpp | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/V3File.cpp b/src/V3File.cpp
index 64dffb0ff..798ef9c77 100644
--- a/src/V3File.cpp
+++ b/src/V3File.cpp
@@ -161,7 +161,7 @@ inline void V3FileDependImp::writeTimes(const string& filename, const string& cm
     *ofp<<"# DESCR"<<"IPTION: Verilator output: Timestamp data for --skip-identical.  Delete at will."<<endl;
     *ofp<<"C \""<<cmdline<<"\""<<endl;
 
-#if !defined (__MINGW32__)
+#ifndef __WIN32
     sync();  // Push files so sizes look correct
 #endif
     for (set<DependFile>::iterator iter=m_filenameList.begin();
@@ -258,7 +258,7 @@ void V3File::createMakeDir() {
     static bool created = false;
     if (!created) {
 	created = true;
-#if !defined (__MINGW32__)
+#ifndef __WIN32
 	mkdir(v3Global.opt.makeDir().c_str(), 0777);
 #else
 	mkdir(v3Global.opt.makeDir().c_str());
diff --git a/src/V3Options.cpp b/src/V3Options.cpp
index 8d9c1969e..99cecc4a1 100644
--- a/src/V3Options.cpp
+++ b/src/V3Options.cpp
@@ -23,8 +23,8 @@
 #include "verilatedos.h"
 #include <sys/types.h>
 #include <sys/stat.h>
-#if !defined(__MINGW32__)
-#include <sys/utsname.h>
+#if !defined(__WIN32)
+# include <sys/utsname.h>
 #endif
 #include <cctype>
 #include <dirent.h>
@@ -330,7 +330,7 @@ void V3Options::setenvStr(const string& envvar, const string& value, const strin
     } else {
 	UINFO(1,"export "<<envvar<<"="<<value<<endl);
     }
-#if !defined (__MINGW32__)
+#ifndef __WIN32
     setenv(envvar.c_str(),value.c_str(),true);
 #else
     //setenv() replaced by putenv() in MinGW environment. Prototype is different
@@ -367,6 +367,9 @@ string V3Options::getenvSYSTEMC_ARCH() {
         // Hardcoded with MINGW current version. Would like a better way.
         string sysname = "MINGW32_NT-5.0";
         var = "mingw32";
+#elsif defined (__WIN32)
+        string sysname = "WIN32";
+        var = "win32";
 #else
 	struct utsname uts;
 	uname(&uts);