From bbc06a4f21fbf57a6ba726e505ef3a1fcd252733 Mon Sep 17 00:00:00 2001 From: havoc Date: Mon, 29 Jun 2020 00:07:39 +0000 Subject: [PATCH 1/1] Fix snd_xmp.c compiling in VS2019 - can't have empty structs. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12747 d7cf8633-e32d-0410-b094-e92efae38249 --- snd_xmp.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/snd_xmp.c b/snd_xmp.c index f19f78b5..5b4e3945 100644 --- a/snd_xmp.c +++ b/snd_xmp.c @@ -143,11 +143,11 @@ static const char **qxmp_version; static const unsigned int *qxmp_vercode; struct xmp_channel { -// int pan; /* Channel pan (0x80 is center) */ -// int vol; /* Channel volume */ -//#define XMP_CHANNEL_SYNTH (1 << 0) /* Channel is synthesized */ -//#define XMP_CHANNEL_MUTE (1 << 1) /* Channel is muted */ -// int flg; /* Channel flags */ + int pan; /* Channel pan (0x80 is center) */ + int vol; /* Channel volume */ +#define XMP_CHANNEL_SYNTH (1 << 0) /* Channel is synthesized */ +#define XMP_CHANNEL_MUTE (1 << 1) /* Channel is muted */ + int flg; /* Channel flags */ }; //struct xmp_sequence { @@ -191,7 +191,8 @@ struct xmp_module_info { struct xmp_sequence *seq_data; /* Pointer to sequence data */ }; -struct xmp_frame_info { /* Current frame information */ +struct xmp_frame_info +// { /* Current frame information */ // int pos; /* Current position */ // int pattern; /* Current pattern */ // int row; /* Current row in pattern */ @@ -223,7 +224,8 @@ struct xmp_frame_info { /* Current frame information */ // unsigned char reserved; /* Reserved */ // struct xmp_event event; /* Current track event */ // } channel_info[XMP_MAX_CHANNELS]; -}; +//} +; // Functions exported from libxmp static xmp_context (*qxmp_create_context) (void); -- 2.39.2