generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-02-16 05:00:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #142 from pothosware/master

Browse Source 
Fixes for visual studio
This commit is contained in:
Pieter Hintjens 2016-01-23 11:48:14 +01:00
commit e1ebeadd05
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -501,7 +501,7 @@ if(MSVC)
RELEASE_POSTFIX "${_zmq_COMPILER}-mt-s-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}" RELEASE_POSTFIX "${_zmq_COMPILER}-mt-s-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
DEBUG_POSTFIX "${_zmq_COMPILER}-mt-sgd-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}" DEBUG_POSTFIX "${_zmq_COMPILER}-mt-sgd-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
COMPILE_FLAGS "/D ZMQ_STATIC" COMPILE_FLAGS "/D ZMQ_STATIC"
OUTPUT_NAME "libzmq") OUTPUT_NAME "libzmq-static")
else() else()
add_library(libzmq SHARED ${sources} ${public_headers} ${html-docs} ${readme-docs} ${zmq-pkgconfig}) add_library(libzmq SHARED ${sources} ${public_headers} ${html-docs} ${readme-docs} ${zmq-pkgconfig})
if(ZMQ_BUILD_FRAMEWORK) if(ZMQ_BUILD_FRAMEWORK)

3
src/zmq.cpp
View File

@ -92,6 +92,7 @@ struct iovec {
typedef char check_msg_t_size typedef char check_msg_t_size
[sizeof (zmq::msg_t) == sizeof (zmq_msg_t) ? 1 : -1]; [sizeof (zmq::msg_t) == sizeof (zmq_msg_t) ? 1 : -1];
extern "C" {
void zmq_version (int *major_, int *minor_, int *patch_) void zmq_version (int *major_, int *minor_, int *patch_)
{ {
@ -1049,3 +1050,5 @@ int zmq_device (int /* type */, void *frontend_, void *backend_)
(zmq::socket_base_t*) frontend_, (zmq::socket_base_t*) frontend_,
(zmq::socket_base_t*) backend_, NULL); (zmq::socket_base_t*) backend_, NULL);
} }
} //extern "C"

3
src/zmq_utils.cpp
View File

@ -34,6 +34,7 @@
# include <sodium.h> # include <sodium.h>
#endif #endif
extern "C" {
void zmq_sleep (int seconds_) void zmq_sleep (int seconds_)
{ {
@ -198,3 +199,5 @@ int zmq_curve_keypair (char *z85_public_key, char *z85_secret_key)
return -1; return -1;
#endif #endif
} }
} //extern "C"