[Bf-blender-cvs] [b926fb8acc3] experimental-build: Revert "Second attempt to fix windows missing ssize_t type."
Bastien Montagne
noreply at git.blender.org
Sun Sep 20 19:43:34 CEST 2020
Commit: b926fb8acc34ef660b28907037b0379d01b42058
Author: Bastien Montagne
Date: Sun Sep 20 19:43:13 2020 +0200
Branches: experimental-build
https://developer.blender.org/rBb926fb8acc34ef660b28907037b0379d01b42058
Revert "Second attempt to fix windows missing ssize_t type."
This reverts commit 5dc643fa98189ada7a394449e220d4f70177d41e.
===================================================================
M source/blender/blenlib/BLI_sys_types.h
M source/blender/blenlib/BLI_winstuff.h
M source/blender/blenloader/intern/readfile.h
===================================================================
diff --git a/source/blender/blenlib/BLI_sys_types.h b/source/blender/blenlib/BLI_sys_types.h
index ff57258f701..398d168b3e2 100644
--- a/source/blender/blenlib/BLI_sys_types.h
+++ b/source/blender/blenlib/BLI_sys_types.h
@@ -59,6 +59,10 @@ typedef uint64_t u_int64_t;
/* MSVC >= 2010 */
#elif defined(_MSC_VER)
# include <stdint.h>
+
+# include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+
#else
/* FreeBSD, Solaris */
diff --git a/source/blender/blenlib/BLI_winstuff.h b/source/blender/blenlib/BLI_winstuff.h
index dc4d6d8fce4..8076724a214 100644
--- a/source/blender/blenlib/BLI_winstuff.h
+++ b/source/blender/blenlib/BLI_winstuff.h
@@ -84,7 +84,7 @@ typedef unsigned int mode_t;
/* python uses HAVE_SSIZE_T */
# ifndef HAVE_SSIZE_T
# define HAVE_SSIZE_T 1
-typedef SSIZE_T ssize_t;
+typedef long ssize_t;
# endif
#endif
diff --git a/source/blender/blenloader/intern/readfile.h b/source/blender/blenloader/intern/readfile.h
index c88cab7ded8..a651107ea10 100644
--- a/source/blender/blenloader/intern/readfile.h
+++ b/source/blender/blenloader/intern/readfile.h
@@ -24,7 +24,7 @@
#pragma once
-#include "BLI_winstuff.h"
+#include "BLI_sys_types.h"
#include "DNA_sdna_types.h"
#include "DNA_space_types.h"
More information about the Bf-blender-cvs
mailing list