diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2010-10-09 08:03:58 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-10-09 08:03:58 +0200 |
| commit | 318cdd1f24cd663702222cc182ae2ccac5e76870 (patch) | |
| tree | 8d18a55d7327e43da1fd81e3df6a8db07e0a1846 /builds | |
| parent | 214b56077a7e5d12813c8034013171d33283566c (diff) | |
| parent | ef8db789a1c97152e84ff03c9a7f6e1e77d95981 (diff) | |
Merge branch 'maint'
* maint:
Version macros added
Conflicts:
builds/msvc/platform.hpp
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'builds')
| -rw-r--r-- | builds/msvc/platform.hpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/builds/msvc/platform.hpp b/builds/msvc/platform.hpp index 4c9cd3a..b20c851 100644 --- a/builds/msvc/platform.hpp +++ b/builds/msvc/platform.hpp @@ -20,15 +20,11 @@ #ifndef __ZMQ_PLATFORM_HPP_INCLUDED__ #define __ZMQ_PLATFORM_HPP_INCLUDED__ -// This is the platform definition for the Windows platform. +// This is the platform definition for the MSVC platform. // 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 1 -#define PACKAGE_VERSION_PATCH 0 +// Place any MSVC-specific definitions here. #define ZMQ_HAVE_WINDOWS |