Skip to content

Commit 564db8c

Browse files
anorakthagreatCloakProjectDev
authored andcommitted
linux compat changes
1 parent c53cb56 commit 564db8c

File tree

8 files changed

+9212
-222
lines changed

8 files changed

+9212
-222
lines changed

Makefile

Lines changed: 9200 additions & 211 deletions
Large diffs are not rendered by default.

src/leveldb/build_detect_platform

100644100755
File mode changed.

src/leveldb/libleveldb.a

267 KB
Binary file not shown.

src/leveldb/libmemenv.a

14.6 KB
Binary file not shown.

src/main.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55
#define USE_LEVELDB 1
66

7+
#include "util.h"
78
#include "alert.h"
89
#include "enigma/enigmaann.h"
910
#include "enigma/enigma.h"
@@ -3041,7 +3042,7 @@ bool ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
30413042
return false;
30423043
}
30433044

3044-
int64 nTime;
3045+
int64_t nTime;
30453046
CAddress addrMe;
30463047
CAddress addrFrom;
30473048
uint64 nNonce = 1;

src/makefile.unix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ LIBS += \
5959
-l rt
6060

6161
ifndef USE_UPNP
62-
override USE_UPNP = -
62+
override USE_UPNP = 0
6363
endif
64-
ifneq (${USE_UPNP}, -)
64+
ifneq (${USE_UPNP}, 0)
6565
LIBS += /opt/deps/miniupnpc/libminiupnpc.a
6666
DEFS += -DUSE_UPNP=$(USE_UPNP) $(addprefix -I,$(/opt/deps/miniupnpc))
6767
endif

src/util.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1275,25 +1275,25 @@ void ShrinkDebugFile()
12751275
}
12761276
}
12771277

1278-
static int64_t nMockTime = 0; //!< For unit testing
1278+
static int64 nMockTime = 0; //!< For unit testing
12791279

1280-
int64_t GetTime()
1280+
int64 GetTime()
12811281
{
1282-
int64_t mocktime = nMockTime;
1282+
int64 mocktime = nMockTime;
12831283
if (mocktime) return mocktime;
12841284

12851285
time_t now = time(NULL);
12861286
assert(now > 0);
12871287
return now;
12881288
}
12891289

1290-
void SetMockTime(int64_t nMockTimeIn)
1290+
void SetMockTime(int64 nMockTimeIn)
12911291
{
12921292
nMockTime = nMockTimeIn;
12931293
}
12941294

12951295
static CCriticalSection cs_nTimeOffset;
1296-
static int64_t nTimeOffset = 0;
1296+
static int64 nTimeOffset = 0;
12971297

12981298
/**
12991299
* "Never go to sea with two chronometers; take one or three."
@@ -1302,13 +1302,13 @@ static int64_t nTimeOffset = 0;
13021302
* - Median of other nodes clocks
13031303
* - The user (asking the user to fix the system clock if the first two disagree)
13041304
*/
1305-
int64_t GetTimeOffset()
1305+
int64 GetTimeOffset()
13061306
{
13071307
LOCK(cs_nTimeOffset);
13081308
return nTimeOffset;
13091309
}
13101310

1311-
int64_t GetAdjustedTime()
1311+
int64 GetAdjustedTime()
13121312
{
13131313
return GetTime() + GetTimeOffset();
13141314
}

src/util.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ int64 GetAdjustedTime();
328328
long hex2long(const char* hexString);
329329
std::string FormatFullVersion();
330330
std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments, bool noSlashes = false);
331-
void AddTimeData(const CNetAddr& ip, int64 nTime);
331+
void AddTimeData(const CNetAddr& ip, int64_t nTime);
332332
void runCommand(std::string strCommand);
333333
void SetupEnvironment();
334334

0 commit comments

Comments
 (0)