diff options
author | bustico | 2008-05-19 16:49:46 +0000 |
---|---|---|
committer | bustico | 2008-05-19 16:49:46 +0000 |
commit | 24264ef88ba6eda574207fde74877eb589062d6d (patch) | |
tree | 52efe89755cb2d540b89ce1ea249e1e16d703ddc | |
parent | 04b93464d970f6345736676a2265e83329c56ad9 (diff) | |
download | ivy-c-24264ef88ba6eda574207fde74877eb589062d6d.zip ivy-c-24264ef88ba6eda574207fde74877eb589062d6d.tar.gz ivy-c-24264ef88ba6eda574207fde74877eb589062d6d.tar.bz2 ivy-c-24264ef88ba6eda574207fde74877eb589062d6d.tar.xz |
* fix some warning raised by visual studio compiler
* remove macro definition in tools Makefile that are exported by main Makefile
-rw-r--r-- | src/ivy.c | 6 | ||||
-rw-r--r-- | tools/Makefile | 13 |
2 files changed, 4 insertions, 15 deletions
@@ -1066,9 +1066,11 @@ IvyChangeMsg (MsgRcvPtr msg, const char *fmt_regex, ... ) int IvySendMsg(const char *fmt, ...) /* version dictionnaire */ { int match_count = 0; - MsgSndDictPtr msgSendDict; - static IvyBuffer buffer = { NULL, 0, 0}; /* Use static mem to eliminate multiple call to malloc /free */ +#ifndef OPENMP + MsgSndDictPtr msgSendDict; +#endif + static IvyBuffer buffer = { NULL, 0, 0}; /* Use static mem to eliminate multiple call to malloc /free */ va_list ap; /* construction du buffer message à partir du format et des arguments */ diff --git a/tools/Makefile b/tools/Makefile index b094dde..8901809 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,16 +1,3 @@ -CC = gcc -g -Wall -CPP='g++' -BUGGY_DEBIAN_OPTION = -DPCRECPP_EXP_DEFN="" -DPCRECPP_EXP_DECL="" -OMPCFLAGS = $(CFLAGS) -fopenmp -DOPENMP=1 -OMPLIB = -lgomp -lpthread -GLIBINC = `pkg-config --cflags glib-2.0` -GLIBLIB = `pkg-config --libs glib-2.0` -GLUTINC = -I/usr/include -I. -GLUTLIB = -L. -lglut -lGLU -lGL -lX11 -lXmu - - - - TARGETS = ivyprobe ivythroughput ivyperf ivyglibprobe ivyxtprobe #ivyprobe_efence OMP_TARGET= ivyprobe_omp ivythroughput_omp |