修复合并错误

This commit is contained in:
zhengchao
2015-12-24 18:25:21 +08:00
parent 83f8b6bd41
commit 57dd773c71
2 changed files with 1 additions and 1866 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -6,7 +6,7 @@ CCC = g++
CFLAGS = -Wall -g -fPIC
CFLAGS += $(OPTFLAGS)
LDDICTATOR = -Wl,-wrap,malloc -Wl,-wrap,calloc -Wl,-wrap,free -Wl,-wrap,realloc
LDFLAGS = -lMESA_handle_logger -lMESA_htable -lpthread
LDFLAGS = -lMESA_handle_logger -lMESA_htable -lpthread -lm -lrulescan -lpcre
#LDFLAGS += $(LDDICTATOR)
MAILLIB = ../lib