Merge pull request #441 from hintjens/master

Fixed build regression

Merge pull request #441 from hintjens/master
Fixed build regression
7f63fc65 · Ian Barber · 9bab3466 · 96811575 · 7f63fc65 · 7f63fc65
Commit 7f63fc65 authored Oct 18, 2012 by Ian Barber
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

socket_base.cpp src/socket_base.cpp +2 -2

socket_base.hpp src/socket_base.hpp +1 -0

No files found.
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -1168,4 +1168,5 @@ void zmq::socket_base_t::stop_monitor()
        monitor_socket = NULL;
        monitor_events = 0;
    }
-}
\ No newline at end of file
+}
+
--- a/src/socket_base.hpp
+++ b/src/socket_base.hpp
@@ -240,3 +240,4 @@ namespace zmq
 }

 #endif
+