Work around to keep compiler going with zlib.h:
authorGuillermo S. Romero <gsr.b3d@infernal-iceberg.com>
Mon, 12 Apr 2010 02:56:41 +0000 (02:56 +0000)
committerGuillermo S. Romero <gsr.b3d@infernal-iceberg.com>
Mon, 12 Apr 2010 02:56:41 +0000 (02:56 +0000)
In file included from MOD_fluidsim_util.c:62:
/usr/include/zlib.h:1440: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘gzseek64’

TODO: string.h appears twice and "" vs <> seems arbitrary.

source/blender/modifiers/intern/MOD_fluidsim_util.c

index 105ee919a4eb4936713b9cebdf2687e182564363..281c8ae90ec79738bd2ef6f109c50b421597233e 100644 (file)
@@ -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>