aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Westbrook <[email protected]>2014-01-27 01:11:38 -0800
committerAlan Westbrook <[email protected]>2014-01-27 01:11:38 -0800
commit5a22b46b1f20f3c693513c6c2ab15c0eb27776b2 (patch)
tree114d71a07dfa7aadcaee72d30283edbbb5c9d8a7
parentUpdate README.md (diff)
downloadarchived-discoin-1.5alpha2.tar.xz
archived-discoin-1.5alpha2.zip
Fix warnings in Mac build1.5alpha2
Minor but annoying warnings from the mac build fixed. * Incorrect duplication of header causing moc build rule duplication in generated makefile * you aren’t supposed to use char as an array type, probably because it can be a signed type in some compilers. Negative array indexes are problematic.
-rw-r--r--dogecoin-qt.pro3
-rw-r--r--src/util.cpp2
2 files changed, 1 insertions, 4 deletions
diff --git a/dogecoin-qt.pro b/dogecoin-qt.pro
index f596a1dfc..9f26beae1 100644
--- a/dogecoin-qt.pro
+++ b/dogecoin-qt.pro
@@ -144,9 +144,7 @@ macx: {
# osx 10.9 has changed the stdlib default to libc++. To prevent some link error, you may need to use libstdc++
QMAKE_CXXFLAGS += -stdlib=libstdc++
- #one of these is unnecessary, perhaps all
QMAKE_CFLAGS_THREAD += -pthread
- QMAKE_LFLAGS_THREAD += -pthread
QMAKE_CXXFLAGS_THREAD += -pthread
}
@@ -268,7 +266,6 @@ HEADERS += src/qt/bitcoingui.h \
src/leveldb.h \
src/threadsafety.h \
src/limitedmap.h \
- src/qt/macnotificationhandler.h \
src/qt/splashscreen.h
SOURCES += src/qt/bitcoin.cpp \
diff --git a/src/util.cpp b/src/util.cpp
index 7b41efd2a..717891a19 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1430,7 +1430,7 @@ long hex2long(const char* hexString)
while (*hexString && ret >= 0)
{
- ret = (ret << 4) | hextable[*hexString++];
+ ret = (ret << 4) | hextable[(uint8_t)*hexString++];
}
return ret;