Selectively move over changes from "edge" to "dev" excluding netcon.

2015-12-21 16:15:39 -08:00
parent a4cfe4cd16
commit 436c1fac1d
27 changed files with 269 additions and 267 deletions
--- a/node/DeferredPackets.hpp
+++ b/node/DeferredPackets.hpp
@@ -88,7 +88,8 @@ private:
 	const RuntimeEnvironment *const RR;
 	unsigned long _readPtr;
 	unsigned long _writePtr;
-	bool _die;
+ 	volatile int _waiting;
+	volatile bool _die;
 	Mutex _q_m;
 	BinarySemaphore _q_s;
 };