build the .so. addresses #1185

git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6366 c7de825b-a66e-492c-adef-691d508d4ae1

newbrt/Makefile

@@ -36,6 +36,9 @@ FORMAT=-Wmissing-format-attribute
 endif
 
 CFLAGS = -Wall -Wextra -Wcast-align -Wbad-function-cast -Wmissing-noreturn $(FORMAT) $(OPTFLAGS) -g3 -ggdb3 $(GCOV_FLAGS) $(PROF_FLAGS) $(FPICFLAGS) $(SHADOW) $(VISIBILITY)
+ifneq ($(CC),icc)
+CFLAGS += -Werror
+endif
 LDFLAGS = $(OPTFLAGS) -g $(GCOV_FLAGS) $(PROF_FLAGS) -lz -lpthread
 CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_XOPEN_SOURCE=500
 

src/Makefile

@@ -10,7 +10,10 @@ VISIBILITY = -fvisibility=hidden
 # PROF_FLAGS=-pg
 OPTFLAGS = -O3 -finline-functions
 # GCOV_FLAGS = -fprofile-arcs -ftest-coverage
-CFLAGS = -W -Wall -Wextra -Werror -g3 -ggdb3 -fPIC $(OPTFLAGS) $(GCOV_FLAGS)
+CFLAGS = -W -Wall -Wextra -g3 -ggdb3 -fPIC $(OPTFLAGS) $(GCOV_FLAGS)
+ifneq ($(CC),icc)
+CFLAGS += -Werror
+endif
 CFLAGS += -Wbad-function-cast -Wcast-align
 CPPFLAGS = -I../include -I../newbrt -I./lock_tree/ -I./range_tree/
 CPPFLAGS += -D_GNU_SOURCE -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE

src/lock_tree/Makefile

@@ -11,7 +11,7 @@ endif
 
 VISIBILITY = -fvisibility=hidden
 
-CFLAGS = -W -Wall -Wextra -Werror -fPIC $(OPTFLAGS)  -g3 -ggdb3 $(GCOV_FLAGS)
+CFLAGS = -W -Wall -Wextra -fPIC $(OPTFLAGS)  -g3 -ggdb3 $(GCOV_FLAGS)
 CFLAGS += -Wbad-function-cast -Wcast-align -Wconversion -Waggregate-return
 CFLAGS += -Wmissing-noreturn -Wmissing-format-attribute
 CFLAGS += $(VISIBILITY) $(PROF_FLAGS)

src/lock_tree/tests/Makefile

@@ -16,7 +16,7 @@ ifeq ($(GCOV),GCOV)
 else
  GCOV_FLAGS =
 endif
-CFLAGS = -W -Wall -Wextra -Werror $(OPTFLAGS) -g3 -ggdb3 $(GCOV_FLAGS)
+CFLAGS = -W -Wall -Wextra $(OPTFLAGS) -g3 -ggdb3 $(GCOV_FLAGS)
 CFLAGS += -Wbad-function-cast -Wcast-align -Waggregate-return
 CFLAGS += -Wmissing-noreturn -Wmissing-format-attribute 
 CPPFLAGS += -L../ -L../../range_tree 

src/range_tree/Makefile

@@ -13,7 +13,7 @@ else
  GCOV_FLAGS =
 endif
 
-CFLAGS = -W -Wall -Wextra -Werror -g3 -ggdb3 -fPIC $(OPTFLAGS) $(GCOV_FLAGS)
+CFLAGS = -W -Wall -Wextra -g3 -ggdb3 -fPIC $(OPTFLAGS) $(GCOV_FLAGS)
 CFLAGS += -Wbad-function-cast -Wcast-align -Wconversion -Waggregate-return
 CFLAGS += -Wmissing-noreturn -Wmissing-format-attribute
 CPPFLAGS = -I. -I../../include -I../../newbrt

src/range_tree/tests/Makefile

@@ -13,7 +13,7 @@ endif
 OPTFLAGS=-O0
 
 # GCOV_FLAGS = -fprofile-arcs -ftest-coverage
-CFLAGS = -W -Wall -Wextra -Werror $(OPTFLAGS) -g3 -ggdb3 $(GCOV_FLAGS)
+CFLAGS = -W -Wall -Wextra $(OPTFLAGS) -g3 -ggdb3 $(GCOV_FLAGS)
 CFLAGS += -Wbad-function-cast -Wcast-align -Wconversion -Waggregate-return
 CFLAGS += -Wmissing-noreturn -Wmissing-format-attribute
 CPPFLAGS += -I../ -I../../../newbrt -I../../../include

src/tests/Makefile

@@ -45,7 +45,10 @@ endif
 
 LIBNAME=libdb.$(LIBEXT)
 # GCOV_FLAGS = -fprofile-arcs -ftest-coverage
-CFLAGS += -Wall -Werror $(OPTFLAGS) -g3 -ggdb3 $(GCOV_FLAGS)
+CFLAGS += -Wall $(OPTFLAGS) -g3 -ggdb3 $(GCOV_FLAGS)
+ifneq ($(CC),icc)
+CFLAGS += -Werror
+endif
 TDB_CPPFLAGS = -I../../include
 
 SRCS = $(sort $(wildcard *.c))

src/ydb.c

@@ -2539,10 +2539,10 @@ static int toku_db_del(DB *db, DB_TXN *txn, DBT *key, u_int32_t flags) {
             return r2;
         }
 
-        inline void cleanup() {
-            if (data.data) toku_free(data.data);
-            if (pkey.data) toku_free(pkey.data);
-        }
+#define cleanup() ({ \
+            if (data.data) toku_free(data.data); \
+            if (pkey.data) toku_free(pkey.data); \
+        })
 
         memset(&data, 0, sizeof data); data.flags = DB_DBT_REALLOC;
         memset(&pkey, 0, sizeof pkey); pkey.flags = DB_DBT_REALLOC;