diff options
author | Gavin Andresen <gavinandresen@gmail.com> | 2012-12-21 14:41:48 -0500 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-01-23 10:42:46 -0500 |
commit | b1024662eafddd5560fbfbac29333e5e967ca0f8 (patch) | |
tree | a8bdd5a1adf525847c8f7df4b2b62268f8d0a738 /src/leveldb/port | |
parent | 8aef119f43ee3b4e75e0f3bd7ea28cf7b29bb582 (diff) |
Port leveldb to MinGW32
Several changes to make the native windows leveldb code compile
with mingw32 and run on 32-bit Windows:
* Remove -std=c++0x dependency (modified code to use NULL instead of
nullptr)
* Link with -lshlwapi
* Only #define snprintf/etc if compiling with Visual Studio
* Do not link against DbgHelp.lib (wrote a CreateDir instead of using
DbgHelp's MakeSureDirectoryPathExists
* Define WINVER=0x0500 so MinGW32 can use the 64-bit-filesystem Windows
api calls
* Define __USE_MINGW_ANSI_STDIO=1 to use MinGW's printf (which supports
%ll)
I also cleaned up makefile.mingw, assuming that dependencies would be in
the standard /usr/local/{include,lib} by default but allowing overriding
with make DEPSDIR=... etc
Diffstat (limited to 'src/leveldb/port')
-rw-r--r-- | src/leveldb/port/port_win.cc | 6 | ||||
-rw-r--r-- | src/leveldb/port/port_win.h | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/leveldb/port/port_win.cc b/src/leveldb/port/port_win.cc index 15dfde1f27..99c1d8e346 100644 --- a/src/leveldb/port/port_win.cc +++ b/src/leveldb/port/port_win.cc @@ -37,7 +37,7 @@ namespace leveldb { namespace port { Mutex::Mutex() : - cs_(nullptr) { + cs_(NULL) { assert(!cs_); cs_ = static_cast<void *>(new CRITICAL_SECTION()); ::InitializeCriticalSection(static_cast<CRITICAL_SECTION *>(cs_)); @@ -48,7 +48,7 @@ Mutex::~Mutex() { assert(cs_); ::DeleteCriticalSection(static_cast<CRITICAL_SECTION *>(cs_)); delete static_cast<CRITICAL_SECTION *>(cs_); - cs_ = nullptr; + cs_ = NULL; assert(!cs_); } @@ -128,7 +128,7 @@ void InitOnce(OnceType* once, void (*initializer)()) { } void* AtomicPointer::Acquire_Load() const { - void * p = nullptr; + void * p = NULL; InterlockedExchangePointer(&p, rep_); return p; } diff --git a/src/leveldb/port/port_win.h b/src/leveldb/port/port_win.h index 849b01705f..45bf2f0ea7 100644 --- a/src/leveldb/port/port_win.h +++ b/src/leveldb/port/port_win.h @@ -31,9 +31,11 @@ #ifndef STORAGE_LEVELDB_PORT_PORT_WIN_H_ #define STORAGE_LEVELDB_PORT_PORT_WIN_H_ +#ifdef _MSC_VER #define snprintf _snprintf #define close _close #define fread_unlocked _fread_nolock +#endif #include <string> #include <stdint.h> @@ -120,7 +122,7 @@ class AtomicPointer { private: void * rep_; public: - AtomicPointer() : rep_(nullptr) { } + AtomicPointer() : rep_(NULL) { } explicit AtomicPointer(void* v); void* Acquire_Load() const; |