[Pkg-javascript-commits] [node-leveldown] 296/492: more windows atomic pointer fixes

[Andrew Kelley]

This is an automated email from the git hooks/post-receive script.

andrewrk-guest pushed a commit to annotated tag rocksdb-0.10.1
in repository node-leveldown.

commit e26f3f284632c9dc9a1648354af01e9b326bbece
Author: Rod Vagg <rod at vagg.org>
Date:   Sat Mar 30 17:41:04 2013 +1100

    more windows atomic pointer fixes
---
 deps/leveldb/port-libuv/atomic_pointer_win.h | 8 +++++++-
 deps/leveldb/port-libuv/port_uv.h            | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/deps/leveldb/port-libuv/atomic_pointer_win.h b/deps/leveldb/port-libuv/atomic_pointer_win.h
index e9b4c87..12ad2ea 100644
--- a/deps/leveldb/port-libuv/atomic_pointer_win.h
+++ b/deps/leveldb/port-libuv/atomic_pointer_win.h
@@ -3,6 +3,9 @@
 
 // credit: https://groups.google.com/forum/#!msg/leveldb/VuECZMnsob4/F6pGPGaK-XwJ
 
+namespace leveldb {
+namespace port {
+
 class AtomicPointer {
   private:
     void* rep_;
@@ -39,4 +42,7 @@ class AtomicPointer {
     inline void NoBarrier_Store(void* v) {
         rep_ = reinterpret_cast<void*>(v);
     }
-};
\ No newline at end of file
+};
+
+} // namespace port
+} // namespace leveldb
diff --git a/deps/leveldb/port-libuv/port_uv.h b/deps/leveldb/port-libuv/port_uv.h
index 8173f9c..bebdc46 100644
--- a/deps/leveldb/port-libuv/port_uv.h
+++ b/deps/leveldb/port-libuv/port_uv.h
@@ -42,9 +42,11 @@
 #endif
 #include <stdint.h>
 #include <string>
-#include "port/atomic_pointer.h"
 #if defined(_MSC_VER)
   #include "atomic_pointer_win.h"
+  #undef small
+#else
+  #include "port/atomic_pointer.h"
 #endif
 
 #ifndef PLATFORM_IS_LITTLE_ENDIAN

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-leveldown.git