Merge pull request #71 from keent/master

Problem: FILEMQ doesn't build with MSVC without DRAFT_API defs and non-…

Author: sappo

include/filemq_library.h

@@ -50,6 +50,7 @@
 //  Opaque class structures to allow forward references
 
 //  Draft APIs, excluded by default in stable releases
+#define WITH_DRAFTS
 #ifdef WITH_DRAFTS
 typedef struct _fmq_msg_t fmq_msg_t;
 #define FMQ_MSG_T_DEFINED

src/filemq_client.c

@@ -3,17 +3,22 @@
 
 int main (int argc, char *argv [])
 {
+	fmq_client_t *client;
+	int rc;
+	zsock_t *msgpipe;
+	zpoller_t *poller;
+
     if (argc < 2) {
         puts ("usage: filemq_client inbox-dir");
         return 0;
     }
 
     //  Create the client
-    fmq_client_t *client = fmq_client_new ();
+    client = fmq_client_new ();
     assert (client);
     fmq_client_verbose = 1;
 
-    int rc = fmq_client_connect (client, "tcp://localhost:5670", 1000);
+    rc = fmq_client_connect (client, "tcp://localhost:5670", 1000);
     assert (rc == 0);
 
     //  Set the clients storage location
@@ -25,11 +30,11 @@ int main (int argc, char *argv [])
     assert (rc >= 0);
 
     //  Get a reference to the msgpipe
-    zsock_t *msgpipe = fmq_client_msgpipe (client);
+    msgpipe = fmq_client_msgpipe (client);
     assert (msgpipe);
 
     //  Setup a poller
-    zpoller_t *poller = zpoller_new ( (void *) msgpipe, NULL);
+    poller = zpoller_new ( (void *) msgpipe, NULL);
     assert (poller);
 
     while (!zsys_interrupted) {

src/filemq_server.c

@@ -3,11 +3,12 @@
 
 int main (int argc, char *argv [])
 {
+	zactor_t *server;
     if (argc < 2) {
         puts ("usage: filemq_server publish-from");
         return 0;
     }
-    zactor_t *server = zactor_new (fmq_server, "filemq_server");
+    server = zactor_new (fmq_server, "filemq_server");
 
     //zstr_send (server, "VERBOSE");
     zstr_sendx (server, "PUBLISH", argv [1], "/", NULL);