From e122e42354149386159fbff82fbd66e7a8ba1fdb Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Sun, 18 Sep 2011 12:41:48 +0200 Subject: [PATCH] assure that base bitcoind and bitcoin still build --- src/makefile.linux-mingw | 4 ++-- src/makefile.mingw | 4 ++-- src/makefile.osx | 4 ++-- src/makefile.unix | 4 ++-- src/makefile.vc | 2 +- src/noui.h | 4 ++++ src/ui.h | 4 +++- 7 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index 24cc127c2..cae82f8cf 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -49,7 +49,7 @@ HEADERS = \ net.h \ noui.h \ protocol.h \ - rpc.h \ + bitcoinrpc.h \ script.h \ serialize.h \ strlcpy.h \ @@ -76,7 +76,7 @@ OBJS= \ obj/main.o \ obj/net.o \ obj/protocol.o \ - obj/rpc.o \ + obj/bitcoinrpc.o \ obj/script.o \ obj/util.o \ obj/wallet.o \ diff --git a/src/makefile.mingw b/src/makefile.mingw index 1ca1a7bbe..5aa5ebab4 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -46,7 +46,7 @@ HEADERS = \ net.h \ noui.h \ protocol.h \ - rpc.h \ + bitcoinrpc.h \ script.h \ serialize.h \ strlcpy.h \ @@ -74,7 +74,7 @@ OBJS= \ obj/main.o \ obj/net.o \ obj/protocol.o \ - obj/rpc.o \ + obj/bitcoinrpc.o \ obj/script.o \ obj/util.o \ obj/wallet.o \ diff --git a/src/makefile.osx b/src/makefile.osx index 97264c7eb..9dce3f3af 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -46,7 +46,7 @@ HEADERS = \ net.h \ noui.h \ protocol.h \ - rpc.h \ + bitcoinrpc.h \ script.h \ serialize.h \ strlcpy.h \ @@ -65,7 +65,7 @@ OBJS= \ obj/main.o \ obj/net.o \ obj/protocol.o \ - obj/rpc.o \ + obj/bitcoinrpc.o \ obj/script.o \ obj/util.o \ obj/wallet.o \ diff --git a/src/makefile.unix b/src/makefile.unix index 298d856ec..2b7f3f679 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -52,7 +52,7 @@ HEADERS = \ net.h \ noui.h \ protocol.h \ - rpc.h \ + bitcoinrpc.h \ script.h \ serialize.h \ strlcpy.h \ @@ -71,7 +71,7 @@ OBJS= \ obj/main.o \ obj/net.o \ obj/protocol.o \ - obj/rpc.o \ + obj/bitcoinrpc.o \ obj/script.o \ obj/util.o \ obj/wallet.o \ diff --git a/src/makefile.vc b/src/makefile.vc index a5437bcf5..5d283793c 100644 --- a/src/makefile.vc +++ b/src/makefile.vc @@ -59,7 +59,7 @@ HEADERS = \ net.h \ noui.h \ protocol.h \ - rpc.h \ + bitcoinrpc.h \ script.h \ serialize.h \ strlcpy.h \ diff --git a/src/noui.h b/src/noui.h index cbe6fa4c7..754c2225f 100644 --- a/src/noui.h +++ b/src/noui.h @@ -67,4 +67,8 @@ inline void MainFrameRepaint() { } +inline void InitMessage(const std::string &message) +{ +} + #endif diff --git a/src/ui.h b/src/ui.h index 2a128a7ba..1784af77b 100644 --- a/src/ui.h +++ b/src/ui.h @@ -24,7 +24,9 @@ void CalledSetStatusBar(const std::string& strText, int nField); void MainFrameRepaint(); void CreateMainWindow(); void SetStartOnSystemStartup(bool fAutoStart); - +inline void InitMessage(const std::string &message) +{ +}