From ef8db789a1c97152e84ff03c9a7f6e1e77d95981 Mon Sep 17 00:00:00 2001
From: Martin Sustrik <sustrik@250bpm.com>
Date: Sat, 9 Oct 2010 07:53:24 +0200
Subject: Version macros added

Macro ZMQ_VERSION represents the current version of 0MQ
Macro ZMQ_MAKE_VERSION(major,minor,patch) allows to create
a representation of the specified version.
The versions can be compared using simple <, >, ==, etc.
operators.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
---
 builds/msvc/platform.hpp |  6 +-----
 configure.in             | 13 -------------
 include/zmq.h            | 10 ++++++++++
 src/zmq.cpp              |  6 +++---
 4 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/builds/msvc/platform.hpp b/builds/msvc/platform.hpp
index 6abfc75..9c0c8ae 100644
--- a/builds/msvc/platform.hpp
+++ b/builds/msvc/platform.hpp
@@ -24,11 +24,7 @@
 //  As a first step of the build process it is copied to
 //  zmq directory to take place of platform.hpp generated from
 //  platform.hpp.in on platforms supported by GNU autotools.
-
-//  0MQ version information
-#define PACKAGE_VERSION_MAJOR 2
-#define PACKAGE_VERSION_MINOR 0
-#define PACKAGE_VERSION_PATCH 10
+//  Place any MSVC-specific definitions here.
 
 #define ZMQ_HAVE_WINDOWS
 
diff --git a/configure.in b/configure.in
index f49622a..25a4eed 100644
--- a/configure.in
+++ b/configure.in
@@ -13,19 +13,6 @@ AC_CONFIG_MACRO_DIR(config)
 AM_CONFIG_HEADER(src/platform.hpp)
 AM_INIT_AUTOMAKE(tar-ustar dist-zip foreign)
 
-# This defines PACKAGE_VERSION_... in src/platform.hpp
-PV_MAJOR=`echo $PACKAGE_VERSION | cut -d . -f 1`
-PV_MINOR=`echo $PACKAGE_VERSION | cut -d . -f 2`
-PV_PATCH=`echo $PACKAGE_VERSION | cut -d . -f 3`
-AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],[$PV_MAJOR],
-    [0MQ major version])
-AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],[$PV_MINOR],
-    [0MQ minor version])
-AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCH],[$PV_PATCH],
-    [0MQ patchlevel])
-# This lets us use PACKAGE_VERSION in Makefiles
-AC_SUBST(PACKAGE_VERSION)
-
 #
 # Libtool -version-info (ABI version)
 #
diff --git a/include/zmq.h b/include/zmq.h
index 90a73c2..efa3edb 100644
--- a/include/zmq.h
+++ b/include/zmq.h
@@ -30,6 +30,16 @@ extern "C" {
 #include "winsock2.h"
 #endif
 
+/*  Version macros                                                            */
+#define ZMQ_VERSION_MAJOR 2
+#define ZMQ_VERSION_MINOR 0
+#define ZMQ_VERSION_PATCH 10
+
+#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
diff --git a/src/zmq.cpp b/src/zmq.cpp
index f3ccaac..5770e04 100644
--- a/src/zmq.cpp
+++ b/src/zmq.cpp
@@ -57,9 +57,9 @@
 
 void zmq_version (int *major_, int *minor_, int *patch_)
 {
-    *major_ = PACKAGE_VERSION_MAJOR;
-    *minor_ = PACKAGE_VERSION_MINOR;
-    *patch_ = PACKAGE_VERSION_PATCH;
+    *major_ = ZMQ_VERSION_MAJOR;
+    *minor_ = ZMQ_VERSION_MINOR;
+    *patch_ = ZMQ_VERSION_PATCH;
 }
 
 const char *zmq_strerror (int errnum_)
-- 
cgit v1.2.3