------------------------------------------------------------
revno: 20
committer: poy <p...@123gen.com>
branch nick: ChatPlugin
timestamp: Mon 2013-04-29 21:33:24 +0200
message:
fix debug asserts
modified:
projects/make/Makefile
src/Rule.cpp
--
lp:~dcplusplus-team/dcpp-plugin-sdk-cpp/ChatPlugin
https://code.launchpad.net/~dcplusplus-team/dcpp-plugin-sdk-cpp/ChatPlugin
Your team Dcplusplus-team is subscribed to branch
lp:~dcplusplus-team/dcpp-plugin-sdk-cpp/ChatPlugin.
To unsubscribe from this branch go to
https://code.launchpad.net/~dcplusplus-team/dcpp-plugin-sdk-cpp/ChatPlugin/+edit-subscription
=== modified file 'projects/make/Makefile'
--- projects/make/Makefile 2013-04-28 21:14:38 +0000
+++ projects/make/Makefile 2013-04-29 19:33:24 +0000
@@ -70,7 +70,7 @@
# boost
CPPFLAGS += -I../../boost
-ifneq ($(findstring mingw, $(shell gcc -dumpmachine)),)
+ifneq ($(findstring mingw, $(COMPILER_SPEC)),)
CPPFLAGS += -DBOOST_ALL_NO_LIB -DBOOST_USE_WINDOWS_H
endif
OBJS += \
@@ -94,7 +94,7 @@
# dwt
CPPFLAGS += -I../../dwt/include -DDWT_SHARED
-ifeq ($(findstring mingw, $(shell gcc -dumpmachine)),)
+ifeq ($(findstring mingw, $(COMPILER_SPEC)),)
$(error "dwt requires a compiler with Windows as target")
else
LINKFLAGS += -lcomctl32 -lcomdlg32 -lgdi32 -lole32 -lshlwapi -luuid -luxtheme
=== modified file 'src/Rule.cpp'
--- src/Rule.cpp 2013-04-28 21:14:38 +0000
+++ src/Rule.cpp 2013-04-29 19:33:24 +0000
@@ -63,7 +63,7 @@
namespace {
bool isSep(int c) {
- return ::isspace(c) || ::ispunct(c);
+ return c > 0 && c < 0xFF && (::isspace(c) || ::ispunct(c));
}
string cssColor(int color) {
_______________________________________________
Mailing list: https://launchpad.net/~linuxdcpp-team
Post to : linuxdcpp-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~linuxdcpp-team
More help : https://help.launchpad.net/ListHelp
