diff options
author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2022-05-30 07:51:17 +0000 |
---|---|---|
committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2022-05-30 07:51:17 +0000 |
commit | dddb2be9e60531f232bb9eb44c25e810112cbe42 (patch) | |
tree | 80a7d00f1b25513208a43e4222dc7df2bc2adeba /src/tftp.h | |
parent | ff0694bbdd7222a9daf47ef45ffaad70e290463c (diff) | |
parent | d4422354726405530957a23b56001e891998e867 (diff) | |
download | slirp-dddb2be9e60531f232bb9eb44c25e810112cbe42.zip slirp-dddb2be9e60531f232bb9eb44c25e810112cbe42.tar.gz slirp-dddb2be9e60531f232bb9eb44c25e810112cbe42.tar.bz2 |
Merge branch 'msvc' into 'master'
msvc fixes
Closes #60
See merge request slirp/libslirp!124
Diffstat (limited to 'src/tftp.h')
-rw-r--r-- | src/tftp.h | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -20,11 +20,13 @@ #define TFTP_FILENAME_MAX 512 #define TFTP_BLOCKSIZE_MAX 1428 +SLIRP_PACKED_BEGIN struct tftphdr { struct udphdr udp; uint16_t tp_op; -} SLIRP_PACKED; +} SLIRP_PACKED_END; +SLIRP_PACKED_BEGIN struct tftp_t { struct tftphdr hdr; union { @@ -38,7 +40,7 @@ struct tftp_t { } tp_error; char tp_buf[TFTP_BLOCKSIZE_MAX + 2]; } x; -} SLIRP_PACKED; +} SLIRP_PACKED_END; struct tftp_session { Slirp *slirp; |