Remove #define loop from util.h

Replace the loop macro with while (true). The #define caused
problems for Qt.
This commit is contained in:
Gavin Andresen
2013-07-31 14:06:44 +10:00
parent c4316fefa5
commit 050d2e953f
13 changed files with 17 additions and 23 deletions

View File

@@ -129,7 +129,7 @@ CAddress GetLocalAddress(const CNetAddr *paddrPeer)
bool RecvLine(SOCKET hSocket, string& strLine)
{
strLine = "";
loop
while (true)
{
char c;
int nBytes = recv(hSocket, &c, 1, 0);
@@ -301,7 +301,7 @@ bool GetMyExternalIP2(const CService& addrConnect, const char* pszGet, const cha
{
if (strLine.empty()) // HTTP response is separated from headers by blank line
{
loop
while (true)
{
if (!RecvLine(hSocket, strLine))
{
@@ -741,7 +741,7 @@ static list<CNode*> vNodesDisconnected;
void ThreadSocketHandler()
{
unsigned int nPrevNodeCount = 0;
loop
while (true)
{
//
// Disconnect nodes
@@ -1105,7 +1105,7 @@ void ThreadMapPort()
string strDesc = "Bitcoin " + FormatFullVersion();
try {
loop {
while (true) {
#ifndef UPNPDISCOVER_SUCCESS
/* miniupnpc 1.5 */
r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype,
@@ -1268,7 +1268,7 @@ void ThreadOpenConnections()
// Initiate network connections
int64 nStart = GetTime();
loop
while (true)
{
ProcessOneShot();
@@ -1309,7 +1309,7 @@ void ThreadOpenConnections()
int64 nANow = GetAdjustedTime();
int nTries = 0;
loop
while (true)
{
// use an nUnkBias between 10 (no outgoing connections) and 90 (8 outgoing connections)
CAddress addr = addrman.Select(10 + min(nOutbound,8)*10);