Peter M. Groen / libmodbus

Commit b14442142bcda0e1d9e151b70d5daa3a4f084f9f

Authored by Tomasz Mon
1 parent b56c00e0

Fix building when byteswap.h is not defined 

Linking failed in Visual Studio due to unresolved bswap_16().
Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
src/modbus-data.c
  View file @b144421
@@ -37,10 +37,9 @@ @@ -37,10 +37,9 @@
37 #endif 37 #endif
38 #if defined(_MSC_VER) && (_MSC_VER >= 1400) 38 #if defined(_MSC_VER) && (_MSC_VER >= 1400)
39 # define bswap_32 _byteswap_ulong 39 # define bswap_32 _byteswap_ulong
  40 +# define bswap_16 _byteswap_ushort
40 #endif 41 #endif
41 42
42 -#if !defined(bswap_32)  
43 -  
44 #if !defined(bswap_16) 43 #if !defined(bswap_16)
45 # warning "Fallback on C functions for bswap_16" 44 # warning "Fallback on C functions for bswap_16"
46 static inline uint16_t bswap_16(uint16_t x) 45 static inline uint16_t bswap_16(uint16_t x)
@@ -49,6 +48,7 @@ static inline uint16_t bswap_16(uint16_t x) @@ -49,6 +48,7 @@ static inline uint16_t bswap_16(uint16_t x)
49 } 48 }
50 #endif 49 #endif
51 50
  51 +#if !defined(bswap_32)
52 # warning "Fallback on C functions for bswap_32" 52 # warning "Fallback on C functions for bswap_32"
53 static inline uint32_t bswap_32(uint32_t x) 53 static inline uint32_t bswap_32(uint32_t x)
54 { 54 {