Peter M. Groen / libmodbus

Commit e07924b54e1afc330db906d9c1806e021546e07d

Authored by Stéphane Raimbault
1 parent ce0bdfbb

Fix wrong constant names to create version number 

Thanks to Denis Davydov
Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
src/modbus-version.h.in
  View file @e07924b
@@ -35,9 +35,9 @@ @@ -35,9 +35,9 @@
35 #define LIBMODBUS_VERSION_STRING "@LIBMODBUS_VERSION@" 35 #define LIBMODBUS_VERSION_STRING "@LIBMODBUS_VERSION@"
36 36
37 /* Numerically encoded version, like 0x010203 */ 37 /* Numerically encoded version, like 0x010203 */
38 -#define LIBMODBUS_VERSION_HEX ((LIBMODBUS_MAJOR_VERSION << 24) | \  
39 - (LIBMODBUS_MINOR_VERSION << 16) | \  
40 - (LIBMODBUS_MICRO_VERSION << 8)) 38 +#define LIBMODBUS_VERSION_HEX ((LIBMODBUS_VERSION_MAJOR << 24) | \
  39 + (LIBMODBUS_VERSION_MINOR << 16) | \
  40 + (LIBMODBUS_VERSION_MICRO << 8))
41 41
42 /* Evaluates to True if the version is greater than @major, @minor and @micro 42 /* Evaluates to True if the version is greater than @major, @minor and @micro
43 */ 43 */
tests/version.c
  View file @e07924b
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 20
21 int main(void) 21 int main(void)
22 { 22 {
23 - printf("Compiled with libmodbus version %s\n", LIBMODBUS_VERSION_STRING); 23 + printf("Compiled with libmodbus version %s (%08X)\n", LIBMODBUS_VERSION_STRING, LIBMODBUS_VERSION_HEX);
24 printf("Linked with libmodbus version %d.%d.%d\n", 24 printf("Linked with libmodbus version %d.%d.%d\n",
25 libmodbus_version_major, libmodbus_version_minor, libmodbus_version_micro); 25 libmodbus_version_major, libmodbus_version_minor, libmodbus_version_micro);
26 26