use cbindgen for wzmq

fastly · Jun 18, 2024 · 4d70985 · 4d70985
1 parent 87075c9
commit 4d70985
Show file tree

Hide file tree

Showing 7 changed files with 95 additions and 196 deletions.
diff --git a/cbindgen.toml b/cbindgen.toml
@@ -1,6 +1,12 @@
 include_guard = "RUST_BINDINGS_H"
 namespace = "ffi"
 
+after_includes = """
+// zmq crate version 0.10 bundles zeromq 4.3
+#define WZMQ_VERSION_MAJOR 4
+#define WZMQ_VERSION_MINOR 3
+"""
+
 [parse]
 parse_deps = true
 include = ["jsonwebtoken", "zmq"]
diff --git a/src/cpp/cpp.pri b/src/cpp/cpp.pri
@@ -6,7 +6,6 @@ INCLUDEPATH += $$PWD/../../target/include
 
 SRC_DIR = $$PWD
 QZMQ_DIR = $$SRC_DIR/qzmq
-RUST_DIR = $$SRC_DIR/..
 
 INCLUDEPATH += $$SRC_DIR
 INCLUDEPATH += $$QZMQ_DIR/src
@@ -16,8 +15,6 @@ DEFINES += NO_IRISNET
 HEADERS += $$SRC_DIR/processquit.h
 SOURCES += $$SRC_DIR/processquit.cpp
 
-INCLUDEPATH += $$RUST_DIR
-
 HEADERS += \
 	$$SRC_DIR/tnetstring.h \
 	$$SRC_DIR/httpheaders.h \

diff --git a/src/cpp/qzmq/src/qzmqcontext.cpp b/src/cpp/qzmq/src/qzmqcontext.cpp
@@ -24,7 +24,9 @@
 #include "qzmqcontext.h"
 
 #include <assert.h>
-#include "rust/wzmq.h"
+#include "rust/bindings.h"
+
+using namespace ffi;
 
 namespace QZmq {
 

diff --git a/src/cpp/qzmq/src/qzmqsocket.cpp b/src/cpp/qzmq/src/qzmqsocket.cpp
@@ -31,9 +31,11 @@
 #include <QTimer>
 #include <QSocketNotifier>
 #include <QMutex>
-#include "rust/wzmq.h"
+#include "rust/bindings.h"
 #include "qzmqcontext.h"
 
+using namespace ffi;
+
 namespace QZmq {
 
 static int get_fd(void *sock)

diff --git a/src/cpp/tests/tests.pro b/src/cpp/tests/tests.pro
@@ -12,7 +12,6 @@ OBJECTS_DIR = $$cpp_build_dir/test-obj
 
 SRC_DIR = $$PWD/..
 QZMQ_DIR = $$SRC_DIR/qzmq
-RUST_DIR = $$SRC_DIR/..
 
 include($$cpp_build_dir/conf.pri)
 
@@ -26,8 +25,6 @@ INCLUDEPATH += $$QZMQ_DIR/src
 
 DEFINES += NO_IRISNET
 
-INCLUDEPATH += $$RUST_DIR
-
 INCLUDES += \
 	main.h