[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28144] trunk/blender/source/blender/ modifiers/intern/MOD_fluidsim_util.c: Work around to keep compiler going with zlib.h:
gsr b3d
gsr.b3d at infernal-iceberg.com
Mon Apr 12 04:56:41 CEST 2010
Revision: 28144
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28144
Author: gsrb3d
Date: 2010-04-12 04:56:41 +0200 (Mon, 12 Apr 2010)
Log Message:
-----------
Work around to keep compiler going with zlib.h:
In file included from MOD_fluidsim_util.c:62:
/usr/include/zlib.h:1440: error: expected ?\226?\128?\152=?\226?\128?\153, ?\226?\128?\152,?\226?\128?\153, ?\226?\128?\152;?\226?\128?\153, ?\226?\128?\152asm?\226?\128?\153 or ?\226?\128?\152__attribute__?\226?\128?\153 before ?\226?\128?\152gzseek64?\226?\128?\153
TODO: string.h appears twice and "" vs <> seems arbitrary.
Modified Paths:
--------------
trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
Modified: trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c 2010-04-12 02:43:17 UTC (rev 28143)
+++ trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c 2010-04-12 02:56:41 UTC (rev 28144)
@@ -30,6 +30,8 @@
*
*/
+#include <zlib.h>
+
#include "stddef.h"
#include "string.h"
#include "math.h"
@@ -51,7 +53,7 @@
#include "DNA_object_types.h"
#include "DNA_object_fluidsim.h"
#include "DNA_scene_types.h"
-#include "DNA_space_types.h" // FILE_MAX
+#include "DNA_space_types.h"
#include "MOD_modifiertypes.h"
#include "MOD_fluidsim_util.h"
@@ -59,7 +61,6 @@
// headers for fluidsim bobj meshes
#include <stdlib.h>
#include "LBM_fluidsim.h"
-#include <zlib.h>
#include <string.h>
#include <stdio.h>
More information about the Bf-blender-cvs
mailing list