Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Luc Peurière <jlp@nerim.net>2005-03-09 22:45:59 +0300
committerJean-Luc Peurière <jlp@nerim.net>2005-03-09 22:45:59 +0300
commitc78e44cdc563853c250da78ee78ba622c39126b2 (patch)
treefb116af7e1edd94ef96ae883bea727be372e2bd2 /source/blender/blenpluginapi
parent77d44e88e95d86661fc8b29db923083ec747cf9d (diff)
big warning hunt commit
lot of casts, added prototypes, missing includes and some true errors
Diffstat (limited to 'source/blender/blenpluginapi')
-rw-r--r--source/blender/blenpluginapi/intern/Makefile5
-rw-r--r--source/blender/blenpluginapi/intern/pluginapi.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/blenpluginapi/intern/Makefile b/source/blender/blenpluginapi/intern/Makefile
index 1a638d848c8..732c419d626 100644
--- a/source/blender/blenpluginapi/intern/Makefile
+++ b/source/blender/blenpluginapi/intern/Makefile
@@ -49,9 +49,8 @@ CPPFLAGS += $(LEVEL_2_CPP_WARNINGS)
# path to our own external headerfiles. On win2k this needs to be
# longer, to avoid the util.h include problem
CPPFLAGS += -I..
-ifeq ($(OS),windows)
- CPPFLAGS += -I../..
-endif
+CPPFLAGS += -I../..
+
# also do dna
CPPFLAGS += -I../../makesdna
# path to blenlib
diff --git a/source/blender/blenpluginapi/intern/pluginapi.c b/source/blender/blenpluginapi/intern/pluginapi.c
index c9cbc72ca60..aefd8d3f458 100644
--- a/source/blender/blenpluginapi/intern/pluginapi.c
+++ b/source/blender/blenpluginapi/intern/pluginapi.c
@@ -48,7 +48,7 @@
#ifdef WIN32
#include "blenpluginapi\util.h"
#else
-#include "util.h"
+#include "blenpluginapi/util.h"
#endif
#include "iff.h"
#include "plugin.h"
@@ -316,6 +316,8 @@ float turbulence1(float noisesize,
* Otherwise they will not be imported from the archive
* library on Unix. -zr
*/
+int pluginapi_force_ref(void);
+
int pluginapi_force_ref(void)
{
return (int) mallocN +