Support 64-bit builds

Author: ibmmqmet

CHANGES.md

@@ -1,53 +1,51 @@
 
-History
-=======
-March 2016 (v1.0)
-* Initial release
+History (newest at top)
+=======================
 
-April 2016 (v1.1)
-* Update to support MQ V9 pageset statistics
-* Improved formatting for import to Access
-* Fixed some mis-labelled columns
+xxxx 2019 (vX.X.X)
+* Update the header filter to force C99 standardised types internally (eg uint32_t)
 
-June 2016 (v1.1.1)
-* Add the "hidden" WTASCORR field
-* Print the buildtime to help know what version is in use
-* Clearer printing of which records were unrecognised
+Sep 2019 (v5.1.5)
+* Percentage processed was not showing correctly for very large files on Windows
 
-June 2016 (v1.2)
-* Add SQL mode to generate DDL corresponding to column headings
-* printWQ now has more descriptive column names
+Aug 2019 (v5.1.4)
+* Newer compilers have changed bitfield structure padding layouts
 
-July 2016
-* Add progress indicator
+Aug 2019 (v5.1.3)
+* Print QJST SLPTU as number not timestamp
 
-August 2016 (v1.2.1)
-* Add correlator field to better link WQ/WTID/WTAS
-* Add user-written content in docs directory. How to use SQL.
+Jul 2019 (v5.1.2)
+* Make sure Windows program pointer sizes are correct
 
-October 2016
-* Support reading from large (>2GB) files
-* SMF 115 subtype 231 (CHIN) records do not use same scale for qwhsdurn
-(though this seems to be undocumented)
+Apr 2019 (v5.1.1)
+* The 912 changes broke QJST printing
 
-February 2017
-* STCK durations printed as just microseconds value when in SQL mode. Still
-split as seconds/microseconds otherwise.
+Mar 2019 (v5.1.0)
+* Add support for MQ 9.1.2 zHyperWrite
 
-May 2017 (v2.0.0)
-* Added support for the 903 SMF extensions
-* Using a VERS flag during the build to select correct base header file
-and features
+Sep 2018 (v5.0.0)
+* Add support for MySQL imports
 
-Oct 2017 (v2.0.1)
-* Found that some 115 subtypes do not have a QWHS structure correctly
-created; cannot rely on it being there
+Jul 2018 (v4.3.0)
+* Add command for converting VBS dataset to USS on z/OS
 
-Jan 2018 (v3.0.0)
-* QCTDNS structure is not initialised when there has been no activity
-* Can now process files that have not been downloaded with the RDW option,
-as some sites do not have suitable ftp package available. New option
-is "-f NORDW".
+Jun 2018 (v4.2.0)
+* Visual Studio 2017 compiler warnings fixed
+* -f sql was not setting correct internal flags
+
+May 2018 (v4.1.0)
+* Ability to add SQL/DDL commands to generated DDL file from templates.
+
+Apr 2018 (v4.0)
+* Add -f option to generate JSON output format
+* Allow -o to specify stdout for output. Modify printf to select stdout/stderr
+as appropriate
+* Add data processing rate (MB/sec) to output
+
+Mar 2018 (v3.2.0)
+* Add code to help add INDEX to columns in the SQL DDL output
+* Add optimisation to Makefiles
+* Even 64-bit values may be too large when they are not really counters
 
 Feb 2018 (v3.1.0)
 * Added a simple "checkpoint" manager to recover after failures of the
@@ -60,44 +58,50 @@ the documentation and product header files claim.
 32-bits compared to the SQL which is signed 32-bit. So switching
 to always use BIGINT.
 
-Mar 2018 (v3.2.0)
-* Add code to help add INDEX to columns in the SQL DDL output
-* Add optimisation to Makefiles
-* Even 64-bit values may be too large when they are not really counters
-
-Apr 2018 (v4.0)
-* Add -f option to generate JSON output format
-* Allow -o to specify stdout for output. Modify printf to select stdout/stderr
-as appropriate
-* Add data processing rate (MB/sec) to output
+Jan 2018 (v3.0.0)
+* QCTDNS structure is not initialised when there has been no activity
+* Can now process files that have not been downloaded with the RDW option,
+as some sites do not have suitable ftp package available. New option
+is "-f NORDW".
 
-May 2018 (v4.1.0)
-* Ability to add SQL/DDL commands to generated DDL file from templates.
+Oct 2017 (v2.0.1)
+* Found that some 115 subtypes do not have a QWHS structure correctly
+created; cannot rely on it being there
 
-Jun 2018 (v4.2.0)
-* Visual Studio 2017 compiler warnings fixed
-* -f sql was not setting correct internal flags
+May 2017 (v2.0.0)
+* Added support for the 903 SMF extensions
+* Using a VERS flag during the build to select correct base header file
+and features
 
-Jul 2018 (v4.3.0)
-* Add command for converting VBS dataset to USS on z/OS
+February 2017
+* STCK durations printed as just microseconds value when in SQL mode. Still
+split as seconds/microseconds otherwise.
 
-Sep 2018 (v5.0.0)
-* Add support for MySQL imports
+October 2016
+* Support reading from large (>2GB) files
+* SMF 115 subtype 231 (CHIN) records do not use same scale for qwhsdurn
+(though this seems to be undocumented)
 
-Mar 2019 (v5.1.0)
-* Add support for MQ 9.1.2 zHyperWrite
+August 2016 (v1.2.1)
+* Add correlator field to better link WQ/WTID/WTAS
+* Add user-written content in docs directory. How to use SQL.
 
-Apr 2019 (v5.1.1)
-* The 912 changes broke QJST printing
+July 2016
+* Add progress indicator
 
-Jul 2019 (v5.1.2)
-* Make sure Windows program pointer sizes are correct
+June 2016 (v1.2)
+* Add SQL mode to generate DDL corresponding to column headings
+* printWQ now has more descriptive column names
 
-Aug 2019 (v5.1.3)
-* Print QJST SLPTU as number not timestamp
+June 2016 (v1.1.1)
+* Add the "hidden" WTASCORR field
+* Print the buildtime to help know what version is in use
+* Clearer printing of which records were unrecognised
 
-Aug 2019 (v5.1.4)
-* Newer compilers have changed bitfield structure padding layouts
+April 2016 (v1.1)
+* Update to support MQ V9 pageset statistics
+* Improved formatting for import to Access
+* Fixed some mis-labelled columns
 
-Sep 2019 (v5.1.5)
-* Percentage processed was not showing correctly for very large files on Windows
+March 2016 (v1.0)
+* Initial release

bin/aix/convH

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

bin/aix/mqsmfcsv

@@ -60,8 +60,8 @@ mqsmfcsv.exe: $(SRC) $(HDR) Makefile.gcc.win dummy
 mqsmfstruc.h: csqdsmfc-$(VERS).h convH.exe dummy	
 	./convH.exe < csqdsmfc-$(VERS).h > $@
 
-convH.exe: convH.c
-	$(CC) $(CFLAGS) -o $@ convH.c
+convH.exe: convH64.c
+	$(CC) $(CFLAGS) -o $@ convH64.c
 	cp $@ ../bin/win
 
 dummy:

bin/linux/convH

@@ -39,7 +39,7 @@ SRC = \
 HDR = mqsmfstruc.h \
       mqsmf.h
 
-default: mqsmfcsv
+default: sizeTest
 
 all: sizeTest shipTest
 tests: all
@@ -57,8 +57,8 @@ mqsmfcsv: $(SRC) $(HDR) Makefile.unix dummy
 mqsmfstruc.h: csqdsmfc-$(VERS).h convH dummy
 	convH < csqdsmfc-$(VERS).h > $@
 
-convH: convH.c dummy
-	$(CC) -o $@ convH.c
+convH: convH64.c dummy
+	$(CC) -o $@ convH64.c
 
 
 dummy:

bin/linux/mqsmfcsv

@@ -49,8 +49,8 @@ mqsmfcsv.exe: $(SRC) $(HDR) Makefile.win
 mqsmfstruc.h: csqdsmfc-$(VERS).h convH.exe dummy
 	convH < csqdsmfc-$(VERS).h > $@
 
-convH.exe: convH.c
-	$(CC) $(CFLAGS) /Fe$@ convH.c
+convH.exe: convH64.c
+	$(CC) $(CFLAGS) /Fe$@ convH64.c
 	copy $@ ..\bin\win
 
 

bin/win/convH.exe

@@ -1,5 +1,6 @@
 #include "stdio.h"
 #include "stddef.h"
+#include "stdint.h"
 #include "mqsmfstruc.h"
 
 void checkStructureSizes(FILE *fp) {