Skip to content

Commit

Permalink
libmodbus: updated modbus-version.h with upstream version
Browse files Browse the repository at this point in the history
  • Loading branch information
tobydox committed Dec 11, 2013
1 parent 03f33ff commit d34d886
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions 3rdparty/libmodbus/src/modbus-version.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,29 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifndef _MODBUS_VERSION_H_
#define _MODBUS_VERSION_H_
#ifndef MODBUS_VERSION_H
#define MODBUS_VERSION_H

/* The major version, (1, if %LIBMODBUS_VERSION is 1.2.3) */
#define LIBMODBUS_VERSION_MAJOR (2)
#define LIBMODBUS_VERSION_MAJOR (3)

/* The minor version (2, if %LIBMODBUS_VERSION is 1.2.3) */
#define LIBMODBUS_VERSION_MINOR (9)
#define LIBMODBUS_VERSION_MINOR (1)

/* The micro version (3, if %LIBMODBUS_VERSION is 1.2.3) */
#define LIBMODBUS_VERSION_MICRO (3)
#define LIBMODBUS_VERSION_MICRO (1)

/* The full version, like 1.2.3 */
#define LIBMODBUS_VERSION 2.9.3
#define LIBMODBUS_VERSION 3.1.1

/* The full version, in string form (suited for string concatenation)
*/
#define LIBMODBUS_VERSION_STRING "2.9.3"
#define LIBMODBUS_VERSION_STRING "3.1.1"

/* Numerically encoded version, like 0x010203 */
#define LIBMODBUS_VERSION_HEX ((LIBMODBUS_MAJOR_VERSION << 24) | \
(LIBMODBUS_MINOR_VERSION << 16) | \
(LIBMODBUS_MICRO_VERSION << 8))
#define LIBMODBUS_VERSION_HEX ((LIBMODBUS_VERSION_MAJOR << 24) | \
(LIBMODBUS_VERSION_MINOR << 16) | \
(LIBMODBUS_VERSION_MICRO << 8))

/* Evaluates to True if the version is greater than @major, @minor and @micro
*/
Expand All @@ -49,4 +49,4 @@
LIBMODBUS_VERSION_MINOR == (minor) && \
LIBMODBUS_VERSION_MICRO >= (micro)))

#endif /* _MODBUS_VERSION_H_ */
#endif /* MODBUS_VERSION_H */

0 comments on commit d34d886

Please sign in to comment.