Skip to content

Commit d7ba5ef

Browse files
authored
Merge pull request #46 from sezero/pragma
load_s3m.c: fix unbalanced pragma pack
2 parents 48be221 + d568614 commit d7ba5ef

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/load_psm.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ typedef struct _PSMSAMPLE
8484
BYTE reserved6[19];
8585
} PSMSAMPLE;
8686

87+
#pragma pack()
88+
8789
void swap_PSMSAMPLE(PSMSAMPLE* p){
8890
p->smpid = bswapLE32(p->smpid);
8991
p->length = bswapLE32(p->length);
@@ -92,8 +94,6 @@ void swap_PSMSAMPLE(PSMSAMPLE* p){
9294
p->samplerate = bswapLE32(p->samplerate);
9395
}
9496

95-
#pragma pack()
96-
9797

9898
BOOL CSoundFile::ReadPSM(LPCBYTE lpStream, DWORD dwMemLength)
9999
//-----------------------------------------------------------

src/load_s3m.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ typedef struct tagS3MFILEHEADER
6363
WORD special;
6464
BYTE channels[32];
6565
} S3MFILEHEADER;
66-
66+
#pragma pack()
6767

6868
void CSoundFile::S3MConvert(MODCOMMAND *m, BOOL bIT) const
6969
//--------------------------------------------------------

0 commit comments

Comments
 (0)