Browse Source

Merge pull request #3091 from Diapolo/misc

misc spelling / space / style fixes
0.10
Wladimir J. van der Laan 11 years ago
parent
commit
6fb27534eb
  1. 4
      configure.ac
  2. 2
      src/chainparams.h

4
configure.ac

@ -154,7 +154,7 @@ use_pkgconfig=yes
case $host in case $host in
*mingw*) *mingw*)
#pkgconfig does more harm than good with mingw #pkgconfig does more harm than good with MinGW
use_pkgconfig=no use_pkgconfig=no
TARGET_OS=windows TARGET_OS=windows
@ -298,7 +298,7 @@ if test x$use_hardening != xno; then
AX_CHECK_COMPILE_FLAG([-fno-stack-protector],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fno-stack-protector"]) AX_CHECK_COMPILE_FLAG([-fno-stack-protector],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fno-stack-protector"])
AX_CHECK_COMPILE_FLAG([-fstack-protector-all],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fstack-protector-all"]) AX_CHECK_COMPILE_FLAG([-fstack-protector-all],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fstack-protector-all"])
# -pie will link successfully with mingw, but it's unsupported and leads to undeterministic binaries # -pie will link successfully with MinGW, but it's unsupported and leads to undeterministic binaries
AX_CHECK_LINK_FLAG([[-pie]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pie"]) AX_CHECK_LINK_FLAG([[-pie]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pie"])
fi fi

2
src/chainparams.h

@ -68,7 +68,7 @@ public:
virtual const vector<CAddress>& FixedSeeds() const = 0; virtual const vector<CAddress>& FixedSeeds() const = 0;
int RPCPort() const { return nRPCPort; } int RPCPort() const { return nRPCPort; }
protected: protected:
CChainParams() {}; CChainParams() {}
uint256 hashGenesisBlock; uint256 hashGenesisBlock;
MessageStartChars pchMessageStart; MessageStartChars pchMessageStart;

Loading…
Cancel
Save