Addresses #293

Updated code based on review,
updated Makefile

git-svn-id: file:///svn/tokudb@2018 c7de825b-a66e-492c-adef-691d508d4ae1

src/lock_tree/Makefile

@@ -3,18 +3,29 @@
 
 LIBNAME=liblocktree
 
-OPTFLAGS = -O0
-ifeq ($(GCOV),GCOV)
+ifneq ($(OPT),)
+ OPTFLAGS = -O4
+else
+ OPTFLAGS = -O0 -g3 -ggdb3
+endif
+
+ifneq ($(GCOV),)
  GCOV_FLAGS = -fprofile-arcs -ftest-coverage
 else
  GCOV_FLAGS =
 endif
 
-CFLAGS = -W -Wall -Werror -g3 -ggdb3 -fPIC $(OPTFLAGS) $(GCOV_FLAGS)
+CFLAGS = -W -Wall -Werror -fPIC $(OPTFLAGS) $(GCOV_FLAGS)
+CFLAGS += -Wbad-function-cast -Wcast-align -Wconversion -Waggregate-return
+CFLAGS += -Wmissing-noreturn -Wmissing-format-attribute
+ifneq ($(W),)
+ CFLAGS+= -Wunreachable-code
+endif
 CPPFLAGS = -I. -I.. -I../range_tree -I../../include -I../../newbrt -L../range_tree
 CPPFLAGS += -D_GNU_SOURCE -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
 
-ifeq ($(OSX),OSX)
+
+ifneq ($(OSX),)
 LIBEXT=dylib
 SHARED=-dynamiclib
 CFLAGS+=-fno-common