added uncommitted norm_engine changes

src/norm_engine.cpp

@@ -267,6 +267,8 @@ void zmq::norm_engine_t::send_data()
                 // Buffer contained end of message (should we flush?)
                 //NormStreamMarkEom(norm_tx_stream);
                 // Note this makes NORM fairly chatty for low duty cycle messaging
+                // but makes sure content is delivered quickly.  Positive acknowledgements
+                // with flush override would make NORM more succinct here
                 NormStreamFlush(norm_tx_stream, true, NORM_FLUSH_ACTIVE);
             }
             tx_index = tx_len = 0;  // all buffered data was written
@@ -344,9 +346,8 @@ void zmq::norm_engine_t::in_event()
                 if (NULL != list) list->Remove(*rxState);
             }
             delete rxState;
-            }
             break;
-            
+        }           
         case NORM_REMOTE_SENDER_INACTIVE:
             // Here we free resources used for this formerly active sender.
             // Note w/ NORM_SYNC_STREAM, if sender reactivates, we may

src/norm_engine.hpp

@@ -2,8 +2,6 @@
 #ifndef __ZMQ_NORM_ENGINE_HPP_INCLUDED__
 #define __ZMQ_NORM_ENGINE_HPP_INCLUDED__
 
-#define ZMQ_HAVE_NORM 1
-
 #if defined ZMQ_HAVE_NORM
 
 #include "io_object.hpp"
@@ -12,7 +10,7 @@
 #include "v2_decoder.hpp"
 #include "v2_encoder.hpp"
 
-#include <norm/include/normApi.h>
+#include <normApi.h>
 
 namespace zmq
 {