[Bf-blender-cvs] [b62ae40ceda] soc-2020-info-editor: Fix compile errors on windows

[Mateusz Grzelinski]

Commit: b62ae40ceda5be576010055984446d78954c0748
Author: Mateusz Grzelinski
Date:   Thu Aug 13 09:13:11 2020 +0200
Branches: soc-2020-info-editor
https://developer.blender.org/rBb62ae40ceda5be576010055984446d78954c0748

Fix compile errors on windows

===================================================================

M       intern/clog/CLG_log.h
M       source/blender/blenkernel/intern/blender.c
M       source/blender/bmesh/intern/bmesh_private.h
M       source/creator/creator_args.c

===================================================================

diff --git a/intern/clog/CLG_log.h b/intern/clog/CLG_log.h
index b88df63f079..f143ddc2a9a 100644
--- a/intern/clog/CLG_log.h
+++ b/intern/clog/CLG_log.h
@@ -85,6 +85,16 @@ extern "C" {
 #  define _CLOG_ATTR_PRINTF_FORMAT(format_param, dots_param)
 #endif
 
+/* workaround: copied from blender\source\blender\blenlib\BLI_compiler_attrs.h 
to avoid making dependency on blenlib */
+/* Use to suppress '-Wimplicit-fallthrough' (in place of 'break'). */
+#ifndef ATTR_FALLTHROUGH
+#  if defined(__GNUC__) && (__GNUC__ >= 7) /* gcc7.0+ only */
+#    define ATTR_FALLTHROUGH __attribute__((fallthrough))
+#  else
+#    define ATTR_FALLTHROUGH ((void)0)
+#  endif
+#endif
+
 /* For printing timestamp. */
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
diff --git a/source/blender/blenkernel/intern/blender.c 
b/source/blender/blenkernel/intern/blender.c
index db921d712b3..d0c92ff1fbf 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -181,7 +181,8 @@ void G_debug_enable(int flags)
   }
 #endif
   if (flags & G_DEBUG_FPE) {
-    main_signal_setup_fpe();
+    // TODO (grzelins) causes linking error on windows
+    // main_signal_setup_fpe();
   }
 
   if (flags & G_DEBUG_MEMORY) {
diff --git a/source/blender/bmesh/intern/bmesh_private.h 
b/source/blender/bmesh/intern/bmesh_private.h
index 312a755c72e..8055c067665 100644
--- a/source/blender/bmesh/intern/bmesh_private.h
+++ b/source/blender/bmesh/intern/bmesh_private.h
@@ -32,7 +32,7 @@
 #ifdef NDEBUG
 /* No error checking for release,
  * it can take most of the CPU time when running some tools. */
-#  define BM_CHECK_ELEMENT(el) (void)(el)
+#  define BM_CHECK_ELEMENT(log_ref, el) (void)(el)
 #else
 int bmesh_elem_check(void *element, const char htype);
 #  define BM_CHECK_ELEMENT(log_ref, el) \
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c
index 5acbc3f9e42..4f3247a3532 100644
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@ -1074,7 +1074,8 @@ static int arg_handle_debug_fpe_set(int UNUSED(argc),
                                     const char **UNUSED(argv),
                                     void *UNUSED(data))
 {
-  G_debug_enable(G_DEBUG_FPE);
+  // G_debug_enable(G_DEBUG_FPE);
+  main_signal_setup_fpe();
   U.runtime.use_settings_from_command_line |= ARGS_DEBUG;
   return 0;
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs