From d403b1624933f0a222bf94b3abf017c7c6557cb4 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 13 Apr 2020 12:33:02 +0200 Subject: [PATCH] dtoolutil: fix compile warnings on Windows --- dtool/src/dtoolutil/executionEnvironment.cxx | 4 ++++ dtool/src/dtoolutil/filename.cxx | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/dtool/src/dtoolutil/executionEnvironment.cxx b/dtool/src/dtoolutil/executionEnvironment.cxx index 5f40578f3d..7d57614e08 100644 --- a/dtool/src/dtoolutil/executionEnvironment.cxx +++ b/dtool/src/dtoolutil/executionEnvironment.cxx @@ -415,7 +415,11 @@ ns_set_environment_variable(const string &var, const string &value) { // putenv() requires us to malloc a new C-style string. char *put = (char *)malloc(putstr.length() + 1); strcpy(put, putstr.c_str()); +#ifdef _MSC_VER + _putenv(put); +#else putenv(put); +#endif } /** diff --git a/dtool/src/dtoolutil/filename.cxx b/dtool/src/dtoolutil/filename.cxx index e59aeb448e..0998a8f7a5 100644 --- a/dtool/src/dtoolutil/filename.cxx +++ b/dtool/src/dtoolutil/filename.cxx @@ -433,7 +433,11 @@ temporary(const string &dirname, const string &prefix, const string &suffix, if (fdirname.empty()) { // If we are not given a dirname, use the system tempnam() function to // create a system-defined temporary filename. +#ifdef _MSC_VER + char *name = _tempnam(nullptr, prefix.c_str()); +#else char *name = tempnam(nullptr, prefix.c_str()); +#endif Filename result = Filename::from_os_specific(name); free(name); result.set_type(type);