Deal with compiler changes on Windows giving different bitfield padding

Author: ibmmqmet

CHANGES.md

@@ -95,3 +95,6 @@ Jul 2019 (v5.1.2)
 
 Aug 2019 (v5.1.3)
 * Print QJST SLPTU as number not timestamp
+
+Aug 2019 (v5.1.4)
+* Newer compilers have changed bitfield structure padding layouts

bin/aix/convH

@@ -4,12 +4,12 @@ plat=`uname`
 
 if [ "$plat" = "AIX" ]
 then
-  flags="-q32 -qmaxmem=-1 $CCEXTRAFLAGS"
+  flags="-q32 -qmaxmem=-1 $CCEXTRAFLAGS -D PLATFORM_AIX"
   cc="xlc"
   targdir="../bin/aix"
   optim="-O3"
 else
-  flags="-m32 $CCEXTRAFLAGS"
+  flags="-m32 $CCEXTRAFLAGS -D PLATFORM_LINUX"
   cc="gcc"
   targdir="../bin/linux"
   optim="-O3"

bin/aix/mqsmfcsv

@@ -1,6 +1,6 @@
 
 CC=i686-w64-mingw32-gcc
-CFLAGS= -I. -m32 -O2
+CFLAGS= -I. -m32 -fpack-struct=1 -DPLATFORM_WINDOWS
 PLATFLAGS=
 VERS=913
 SRC = mqsmf.c \
@@ -9,6 +9,7 @@ SRC = mqsmf.c \
       smfConv.c \
       smfJson.c \
       smfPrint.c \
+      checkSize.c \
       printDEBUG.c \
       printQ5ST.c    \
       printQCST.c    \
@@ -38,6 +39,11 @@ SRC = mqsmf.c \
 HDR = mqsmfstruc.h \
       mqsmf.h
 
+checkSize: mqsmfcsv.exe
+	./mqsmfcsv.exe -v > sizes.tmp
+	diff -b sizes.tmp sizes.master
+
+
 mqsmfcsv.exe: $(SRC) $(HDR) Makefile.gcc.win dummy
 	-rm -f $@
 	$(CC) $(PLATFLAGS) -o $@ $(SRC) $(CFLAGS) -DCSQDSMF_VERSION=$(VERS)
@@ -48,7 +54,7 @@ mqsmfstruc.h: csqdsmfc-$(VERS).h convH.exe dummy
 	./convH.exe < csqdsmfc-$(VERS).h > $@
 
 convH.exe: convH.c
-	$(CC) -o $@ convH.c
+	$(CC) $(CFLAGS) -o $@ convH.c
 	cp $@ ../bin/win
 
 

bin/linux/convH

@@ -8,6 +8,7 @@ SRC = \
       smfDate.c \
       smfConv.c \
       smfJson.c \
+      checkSize.c \
       printDEBUG.c \
       printQ5ST.c    \
       printQCST.c    \
@@ -38,6 +39,10 @@ SRC = \
 HDR = mqsmfstruc.h \
       mqsmf.h
 
+checkSize: mqsmfcsv
+	./mqsmfcsv -v > sizes.tmp
+	diff -b sizes.tmp sizes.master
+
 mqsmfcsv: $(SRC) $(HDR) Makefile.unix dummy
 	$(CC) $(PLATFLAGS) -o $@ $(SRC) $(CFLAGS) -DCSQDSMF_VERSION=$(VERS)