modbus-data.c: bswap checking inconsistency

[dreamflow]

in src/modbus-data.c in line 57

#if !defined(__CYGWIN__) && !defined(bswap_16)

and line 65

#if !defined(bswap_32)

look inconsistent.

shouldn't both lines be more consistent ?
like for example adapt line 65 according to line 57 and change line 65 to

#if !defined(__CYGWIN__) && !defined(bswap_32)

or vice versa adapt line 57 according to line 65 and change line 57 to

#if !defined(bswap_16)

[stephane]

I can't remember why there is a check against CYGWIN on line 57.

[dreamflow]

i'm in favour of merging the Remove CYGWIN condition commit
from the bswap-check branch into the master branch.

the CYGWIN check in src/modbus-data.c in line 57 is not needed
and it makes not really sense, because the bswap_16 function
is not provided by CYGWIN. the bswap_16 function is provided
by gcc as __builtin_bswap16 . ggc provides its __builtin_bswap16
independet of CYGWIN, for example when MSYS is used instead of CYGWIN.

commit-history of the CYGWIN-check:
created/added in commit cb4d3ea
improved in commit 67cacf8

[stephane]

Merged. Thank you.