blob: 660e43483dd4c78464b1441453aab77b6b577898 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
diff -ruN orig/src/include/OpenImageIO/fstream_mingw.h new/src/include/OpenImageIO/fstream_mingw.h
--- orig/src/include/OpenImageIO/fstream_mingw.h 2020-05-10 23:43:52.000000000 -0400
+++ new/src/include/OpenImageIO/fstream_mingw.h 2020-05-20 09:41:53.992747647 -0400
@@ -18,7 +18,7 @@
#include <ostream>
#if defined(_WIN32) && defined(__GLIBCXX__)
-# include <Share.h>
+# include <share.h>
# include <ext/stdio_filebuf.h> // __gnu_cxx::stdio_filebuf
# include <fcntl.h>
# include <sys/stat.h>
diff -ruN orig/src/libutil/sysutil.cpp new/src/libutil/sysutil.cpp
--- orig/src/libutil/sysutil.cpp 2020-05-10 23:43:52.000000000 -0400
+++ new/src/libutil/sysutil.cpp 2020-05-20 09:41:54.029414435 -0400
@@ -41,7 +41,7 @@
#ifdef _WIN32
# define WIN32_LEAN_AND_MEAN
# define DEFINE_CONSOLEV2_PROPERTIES
-# include <Psapi.h>
+# include <psapi.h>
# include <cstdio>
# include <io.h>
# include <malloc.h>
@@ -207,7 +207,7 @@
void
Sysutil::get_local_time(const time_t* time, struct tm* converted_time)
{
-#ifdef _MSC_VER
+#ifdef _WIN32
localtime_s(converted_time, time);
#else
localtime_r(time, converted_time);
|