From 24264ef88ba6eda574207fde74877eb589062d6d Mon Sep 17 00:00:00 2001
From: bustico
Date: Mon, 19 May 2008 16:49:46 +0000
Subject: * fix some warning raised by visual studio compiler * remove macro
 definition in tools Makefile that are exported by main Makefile

---
 src/ivy.c      |  6 ++++--
 tools/Makefile | 13 -------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/ivy.c b/src/ivy.c
index a873762..2dd3a90 100644
--- a/src/ivy.c
+++ b/src/ivy.c
@@ -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 
 
-- 
cgit v1.1