diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2010-10-15 17:13:36 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-10-15 17:13:36 +0200 |
| commit | eeb8e7c8beef83fe8c23bde888a1081fc9e8e3ec (patch) | |
| tree | daca0d83cfe2d071518692475b5b0ca09d3a0d95 /include | |
| parent | 7b9e39724eeecf33dde3b0e4fd9f205480afb977 (diff) | |
| parent | 3cf01bf56e66657da795e43f09fa2499b2381dc9 (diff) | |
Merge branch 'maint'
* maint:
Makefile.am: Add missing files to distribution, improve maintainer-clean
configure.in: Extract API version from zmq.h
Added bin directory to ignore list.
Conflicts:
configure.in
include/zmq.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/zmq.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/include/zmq.h b/include/zmq.h index 910e381..9684cd5 100644 --- a/include/zmq.h +++ b/include/zmq.h @@ -30,16 +30,6 @@ extern "C" { #include "winsock2.h" #endif -/* Version macros */ -#define ZMQ_VERSION_MAJOR 2 -#define ZMQ_VERSION_MINOR 1 -#define ZMQ_VERSION_PATCH 0 - -#define ZMQ_MAKE_VERSION(major, minor, patch) \ - (major * 10000 + minor * 100 + patch) -#define ZMQ_VERSION \ - ZMQ_MAKE_VERSION(ZMQ_VERSION_MAJOR, ZMQ_VERSION_MINOR, ZMQ_VERSION_PATCH) - /* Win32 needs special handling for DLL exports */ #if defined _WIN32 # if defined DLL_EXPORT @@ -55,6 +45,17 @@ extern "C" { /* 0MQ versioning support. */ /******************************************************************************/ +/* Version macros for compile-time API version detection */ +#define ZMQ_VERSION_MAJOR 2 +#define ZMQ_VERSION_MINOR 1 +#define ZMQ_VERSION_PATCH 0 + +#define ZMQ_MAKE_VERSION(major, minor, patch) \ + ((major) * 10000 + (minor) * 100 + (patch)) +#define ZMQ_VERSION \ + ZMQ_MAKE_VERSION(ZMQ_VERSION_MAJOR, ZMQ_VERSION_MINOR, ZMQ_VERSION_PATCH) + +/* Run-time API version detection */ ZMQ_EXPORT void zmq_version (int *major, int *minor, int *patch); /******************************************************************************/ |