[Bf-blender-cvs] [dca1a1198ad] experimental-build: Revert "Attempt to fix windowz building due to missing ssize_t type, take III."
Bastien Montagne
noreply at git.blender.org
Sun Sep 20 19:43:33 CEST 2020
Commit: dca1a1198ad8c5ee902bdfa932dc4e1c9ebcbeaa
Author: Bastien Montagne
Date: Sun Sep 20 19:43:03 2020 +0200
Branches: experimental-build
https://developer.blender.org/rBdca1a1198ad8c5ee902bdfa932dc4e1c9ebcbeaa
Revert "Attempt to fix windowz building due to missing ssize_t type, take III."
This reverts commit 241ac50684249056bbc8ca6db7f4f11342174807.
===================================================================
M source/blender/blenloader/intern/readfile.h
M source/blender/blenloader/intern/undofile.c
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.h b/source/blender/blenloader/intern/readfile.h
index d43f7ded50e..c88cab7ded8 100644
--- a/source/blender/blenloader/intern/readfile.h
+++ b/source/blender/blenloader/intern/readfile.h
@@ -24,9 +24,7 @@
#pragma once
-#ifdef WIN32
-# include "BLI_winstuff.h"
-#endif
+#include "BLI_winstuff.h"
#include "DNA_sdna_types.h"
#include "DNA_space_types.h"
diff --git a/source/blender/blenloader/intern/undofile.c b/source/blender/blenloader/intern/undofile.c
index 92aec13ecf1..4da73138c38 100644
--- a/source/blender/blenloader/intern/undofile.c
+++ b/source/blender/blenloader/intern/undofile.c
@@ -252,11 +252,7 @@ bool BLO_memfile_write_file(struct MemFile *memfile, const char *filename)
}
for (chunk = memfile->chunks.first; chunk; chunk = chunk->next) {
-#ifdef _WIN32
- if ((size_t)write(file, chunk->buf, (uint)chunk->size) != chunk->size) {
-#else
if ((size_t)write(file, chunk->buf, chunk->size) != chunk->size) {
-#endif
break;
}
}
More information about the Bf-blender-cvs
mailing list