From: Gavin Andresen <gavinandresen@gmail.com>
Date: Thu, 1 Sep 2011 15:52:07 +0000 (-0400)
Subject: Merge branch 'code-cleanup' of git://github.com/muggenhor/bitcoin
X-Git-Tag: v0.4.0-unstable~227^2~36
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=dd7868364d9a14349ff82f74fc451db5e6b6b7b9

Merge branch 'code-cleanup' of git://github.com/muggenhor/bitcoin
---

dd7868364d9a14349ff82f74fc451db5e6b6b7b9
diff --cc src/main.cpp
index 36fdaa7,8b4b3df..d6bfc63
--- a/src/main.cpp
+++ b/src/main.cpp
@@@ -29,8 -29,8 +29,8 @@@ map<COutPoint, CInPoint> mapNextTx
  
  map<uint256, CBlockIndex*> mapBlockIndex;
  uint256 hashGenesisBlock("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f");
- CBigNum bnProofOfWorkLimit(~uint256(0) >> 32);
+ static CBigNum bnProofOfWorkLimit(~uint256(0) >> 32);
 -const int nTotalBlocksEstimate = 134444; // Conservative estimate of total nr of blocks on main chain
 +const int nTotalBlocksEstimate = 140700; // Conservative estimate of total nr of blocks on main chain
  const int nInitialBlockThreshold = 120; // Regard blocks up until N-threshold as "initial download"
  CBlockIndex* pindexGenesisBlock = NULL;
  int nBestHeight = -1;
diff --cc src/makefile.linux-mingw
index ddf9769,12f6e21..24cc127
--- a/src/makefile.linux-mingw
+++ b/src/makefile.linux-mingw
@@@ -32,15 -32,36 +32,35 @@@ LIBS= 
   -l ssl \
   -l crypto
  
 -DEFS=-D_MT -DWIN32 -D__WXMSW__ -D_WINDOWS -DNOPCH -DUSE_SSL
 +DEFS=-D_MT -DWIN32 -D__WXMSW__ -D_WINDOWS -DNOPCH -DUSE_SSL -DBOOST_THREAD_USE_LIB
  DEBUGFLAGS=-g -D__WXDEBUG__
  CFLAGS=-O2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
- HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \
-     script.h db.h net.h irc.h keystore.h main.h wallet.h rpc.h uibase.h ui.h noui.h \
-     crypter.h init.h
+ HEADERS = \
+     base58.h \
+     bignum.h \
+     crypter.h \
+     db.h \
+     headers.h \
+     init.h \
+     irc.h \
+     key.h \
+     keystore.h \
+     main.h \
+     net.h \
+     noui.h \
+     protocol.h \
+     rpc.h \
+     script.h \
+     serialize.h \
+     strlcpy.h \
+     ui.h \
+     uibase.h \
+     uint256.h \
+     util.h \
+     wallet.h
  
  ifdef USE_UPNP
 -	INCLUDEPATHS += -I"$(DEPSDIR)/upnpc-exe-win32-20110215"
 -	LIBPATHS += -L"$(DEPSDIR)/upnpc-exe-win32-20110215"
 +	LIBPATHS += -L"$(DEPSDIR)/miniupnpc"
  	LIBS += -l miniupnpc -l iphlpapi
  	DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP)
  endif
diff --cc src/makefile.mingw
index 05d0fd0,893700b..1ca1a7b
--- a/src/makefile.mingw
+++ b/src/makefile.mingw
@@@ -29,16 -29,36 +29,36 @@@ LIBS= 
   -l ssl \
   -l crypto
  
 -DEFS=-DWIN32 -D__WXMSW__ -D_WINDOWS -DNOPCH -DUSE_SSL
 +DEFS=-DWIN32 -D__WXMSW__ -D_WINDOWS -DNOPCH -DUSE_SSL -DBOOST_THREAD_USE_LIB
  DEBUGFLAGS=-g -D__WXDEBUG__
  CFLAGS=-mthreads -O2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
- HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \
-     script.h db.h net.h irc.h keystore.h main.h wallet.h rpc.h uibase.h ui.h noui.h \
-     init.h crypter.h
+ HEADERS = \
+     base58.h \
+     bignum.h \
+     crypter.h \
+     db.h \
+     headers.h \
+     init.h \
+     irc.h \
+     key.h \
+     keystore.h \
+     main.h \
+     net.h \
+     noui.h \
+     protocol.h \
+     rpc.h \
+     script.h \
+     serialize.h \
+     strlcpy.h \
+     ui.h \
+     uibase.h \
+     uint256.h \
+     util.h \
+     wallet.h
  
  ifdef USE_UPNP
 - INCLUDEPATHS += -I"C:\upnpc-exe-win32-20110215"
 - LIBPATHS += -L"C:\upnpc-exe-win32-20110215"
 + INCLUDEPATHS += -I"C:\miniupnpc-1.6-mgw"
 + LIBPATHS += -L"C:\miniupnpc-1.6-mgw"
   LIBS += -l miniupnpc -l iphlpapi
   DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP)
  endif