[Bf-committers] [Bf-blender-cvs] [af86b00] master: Include removal gave problems with windows, ifdef some back in for windows only
Sergey Sharybin
sergey.vfx at gmail.com
Thu May 1 08:06:27 CEST 2014
Can we NOT be doing a conditional headers include? This is just
ridiculously stupid and asking for problems.
I could see why stuff like M_PI _could_ be platform specific (for which is
still hate ifdef-ed includes), but stuff like
#ifdef WIN32
# include "BLI_string.h" /* BLI_strcasecmp */
#endif
i really don't believe only needed for specific platform. If some .c file
uses some function, it IS to include header where the function is declared
and never rely on the indirect includes.
On Thu, May 1, 2014 at 3:21 AM, Campbell Barton <noreply at git.blender.org>wrote:
> Commit: af86b008b2a3dacc33b4987c50d8ffa24f6f9817
> Author: Campbell Barton
> Date: Thu May 1 07:21:08 2014 +1000
> https://developer.blender.org/rBaf86b008b2a3dacc33b4987c50d8ffa24f6f9817
>
> Include removal gave problems with windows, ifdef some back in for windows
> only
>
> ===================================================================
>
> M source/blender/blenkernel/intern/customdata.c
> M source/blender/blenkernel/intern/ipo.c
> M source/blender/blenlib/intern/path_util.c
> M source/blender/blenlib/intern/smallhash.c
> M source/blender/bmesh/intern/bmesh_mesh.c
> M source/blender/editors/interface/interface_style.c
> M source/blender/editors/screen/area.c
> M source/blender/editors/space_outliner/outliner_tree.c
> M source/blender/editors/space_view3d/view3d_ops.c
> M source/blender/imbuf/intern/allocimbuf.c
> M source/blender/python/intern/bpy_interface.c
> M source/blender/python/intern/bpy_rna_array.c
> M source/blender/python/intern/bpy_traceback.c
>
> ===================================================================
>
> diff --git a/source/blender/blenkernel/intern/customdata.c
> b/source/blender/blenkernel/intern/customdata.c
> index fd43501..57758ac 100644
> --- a/source/blender/blenkernel/intern/customdata.c
> +++ b/source/blender/blenkernel/intern/customdata.c
> @@ -63,6 +63,10 @@
> #include <math.h>
> #include <string.h>
>
> +#ifdef WIN32
> +# include "BLI_alloca.h"
> +#endif
> +
> /* number of layers to add when growing a CustomData object */
> #define CUSTOMDATA_GROW 5
>
> diff --git a/source/blender/blenkernel/intern/ipo.c
> b/source/blender/blenkernel/intern/ipo.c
> index 6f7ee31..7385322 100644
> --- a/source/blender/blenkernel/intern/ipo.c
> +++ b/source/blender/blenkernel/intern/ipo.c
> @@ -77,6 +77,10 @@
>
> #include "MEM_guardedalloc.h"
>
> +#ifdef WIN32
> +# include "BLI_math_base.h" /* M_PI */
> +#endif
> +
> /* *************************************************** */
> /* Old-Data Freeing Tools */
>
> diff --git a/source/blender/blenlib/intern/path_util.c
> b/source/blender/blenlib/intern/path_util.c
> index 2c24a89..f207329 100644
> --- a/source/blender/blenlib/intern/path_util.c
> +++ b/source/blender/blenlib/intern/path_util.c
> @@ -50,6 +50,8 @@
> #include "GHOST_Path-api.h"
>
> #ifdef WIN32
> +# include "MEM_guardedalloc.h"
> +
> # include "utf_winfunc.h"
> # include "utfconv.h"
> # include <io.h>
> diff --git a/source/blender/blenlib/intern/smallhash.c
> b/source/blender/blenlib/intern/smallhash.c
> index d6b2383..e8e3387 100644
> --- a/source/blender/blenlib/intern/smallhash.c
> +++ b/source/blender/blenlib/intern/smallhash.c
> @@ -56,6 +56,10 @@
>
> #include "BLI_utildefines.h"
>
> +#ifdef WIN32
> +# include "BLI_alloca.h"
> +#endif
> +
> #include "BLI_smallhash.h"
>
> #include "BLI_strict_flags.h"
> diff --git a/source/blender/bmesh/intern/bmesh_mesh.c
> b/source/blender/bmesh/intern/bmesh_mesh.c
> index e9d3c36..6b040ef 100644
> --- a/source/blender/bmesh/intern/bmesh_mesh.c
> +++ b/source/blender/bmesh/intern/bmesh_mesh.c
> @@ -40,6 +40,10 @@
> #include "BKE_editmesh.h"
> #include "BKE_multires.h"
>
> +#ifdef WIN32
> +# include "BLI_alloca.h"
> +#endif
> +
> #include "intern/bmesh_private.h"
>
> /* used as an extern, defined in bmesh.h */
> diff --git a/source/blender/editors/interface/interface_style.c
> b/source/blender/editors/interface/interface_style.c
> index bbdfd1d..fa31c20 100644
> --- a/source/blender/editors/interface/interface_style.c
> +++ b/source/blender/editors/interface/interface_style.c
> @@ -55,6 +55,9 @@
>
> #include "interface_intern.h"
>
> +#ifdef WIN32
> +# include "BLI_math_base.h" /* M_PI */
> +#endif
>
> /* style + theme + layout-engine = UI */
>
> diff --git a/source/blender/editors/screen/area.c
> b/source/blender/editors/screen/area.c
> index 151764d..05659f6 100644
> --- a/source/blender/editors/screen/area.c
> +++ b/source/blender/editors/screen/area.c
> @@ -68,6 +68,10 @@
>
> #include "screen_intern.h"
>
> +#ifdef WIN32
> +# include "BLI_alloca.h"
> +#endif
> +
> extern void ui_draw_anti_tria(float x1, float y1, float x2, float y2,
> float x3, float y3); /* xxx temp */
>
> /* general area and region code */
> diff --git a/source/blender/editors/space_outliner/outliner_tree.c
> b/source/blender/editors/space_outliner/outliner_tree.c
> index bfa0dcd..76a0839 100644
> --- a/source/blender/editors/space_outliner/outliner_tree.c
> +++ b/source/blender/editors/space_outliner/outliner_tree.c
> @@ -77,6 +77,10 @@
>
> #include "outliner_intern.h"
>
> +#ifdef WIN32
> +# include "BLI_math_base.h" /* M_PI */
> +#endif
> +
> /* ********************************************************* */
> /* Persistent Data */
>
> diff --git a/source/blender/editors/space_view3d/view3d_ops.c
> b/source/blender/editors/space_view3d/view3d_ops.c
> index 4fa995b..a8128ba 100644
> --- a/source/blender/editors/space_view3d/view3d_ops.c
> +++ b/source/blender/editors/space_view3d/view3d_ops.c
> @@ -57,6 +57,10 @@
>
> #include "view3d_intern.h"
>
> +#ifdef WIN32
> +# include "BLI_math_base.h" /* M_PI */
> +#endif
> +
> /* ************************** copy paste ***************************** */
>
> static int view3d_copybuffer_exec(bContext *C, wmOperator *op)
> diff --git a/source/blender/imbuf/intern/allocimbuf.c
> b/source/blender/imbuf/intern/allocimbuf.c
> index ff9bef7..6125177 100644
> --- a/source/blender/imbuf/intern/allocimbuf.c
> +++ b/source/blender/imbuf/intern/allocimbuf.c
> @@ -48,6 +48,7 @@
> #include "MEM_guardedalloc.h"
>
> #include "BLI_threads.h"
> +#include "BLI_utildefines.h"
>
> static SpinLock refcounter_spin;
>
> diff --git a/source/blender/python/intern/bpy_interface.c
> b/source/blender/python/intern/bpy_interface.c
> index 90cc07d..43ca695 100644
> --- a/source/blender/python/intern/bpy_interface.c
> +++ b/source/blender/python/intern/bpy_interface.c
> @@ -37,6 +37,10 @@
>
> #include <Python.h>
>
> +#ifdef WIN32
> +# include "BLI_math_base.h" /* finite */
> +#endif
> +
> #include "MEM_guardedalloc.h"
>
> #include "BLI_utildefines.h"
> diff --git a/source/blender/python/intern/bpy_rna_array.c
> b/source/blender/python/intern/bpy_rna_array.c
> index a7a3c49..033f8a3 100644
> --- a/source/blender/python/intern/bpy_rna_array.c
> +++ b/source/blender/python/intern/bpy_rna_array.c
> @@ -30,11 +30,12 @@
>
> #include "RNA_types.h"
>
> -
> #include "bpy_rna.h"
> #include "BKE_global.h"
> #include "MEM_guardedalloc.h"
>
> +#include "BLI_utildefines.h"
> +
> #include "RNA_access.h"
>
> #define USE_MATHUTILS
> diff --git a/source/blender/python/intern/bpy_traceback.c
> b/source/blender/python/intern/bpy_traceback.c
> index a917421..7ae6d3a 100644
> --- a/source/blender/python/intern/bpy_traceback.c
> +++ b/source/blender/python/intern/bpy_traceback.c
> @@ -31,6 +31,9 @@
>
> #include "BLI_utildefines.h"
> #include "BLI_path_util.h"
> +#ifdef WIN32
> +# include "BLI_string.h" /* BLI_strcasecmp */
> +#endif
>
> #include "bpy_traceback.h"
>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>
--
With best regards, Sergey Sharybin
More information about the Bf-committers
mailing list