Skip to content

Commit dfcc0ed

Browse files
ibmmqmetibmmqmet
committed
2 parents fc0fdeb + c44b74e commit dfcc0ed

File tree

3 files changed

+101
-0
lines changed

3 files changed

+101
-0
lines changed

‎ibmmq/cmqc_linux.go‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package ibmmq
22

33
/*
4+
<<<<<<< HEAD
45
****************************************************************
56
*
67
* IBM MQ for LinuxIntel
@@ -36,6 +37,13 @@ package ibmmq
3637
* Pointer Size: 64 Bit
3738
* <END_BUILDINFO>
3839
*/
40+
=======
41+
This file was generated from ./cmqstrc.h.903.amd64_linux2 using
42+
the hdr.sh script.
43+
It is used for 64-bit applications.
44+
*/
45+
46+
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
3947
var (
4048
MQACH_CURRENT_LENGTH int32 = 72
4149
MQACH_CURRENT_VERSION int32 = 1
@@ -723,6 +731,7 @@ var (
723731
MQCDC_CURRENT_LENGTH int32 = 1984
724732
MQCDC_CURRENT_VERSION int32 = 11
725733
MQCDC_LENGTH_1 int32 = 984
734+
<<<<<<< HEAD
726735
MQCDC_LENGTH_10 int32 = 1920
727736
MQCDC_LENGTH_11 int32 = 1984
728737
MQCDC_LENGTH_2 int32 = 1312
@@ -733,6 +742,10 @@ var (
733742
MQCDC_LENGTH_7 int32 = 1792
734743
MQCDC_LENGTH_8 int32 = 1888
735744
MQCDC_LENGTH_9 int32 = 1912
745+
=======
746+
MQCDC_LENGTH_2 int32 = 1312
747+
MQCDC_LENGTH_3 int32 = 1480
748+
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
736749
MQCDC_NO_SENDER_CONVERSION int32 = 0
737750
MQCDC_SENDER_CONVERSION int32 = 1
738751
MQCDC_VERSION_1 int32 = 1
@@ -749,6 +762,7 @@ var (
749762
MQCD_CURRENT_LENGTH int32 = 1984
750763
MQCD_CURRENT_VERSION int32 = 11
751764
MQCD_LENGTH_1 int32 = 984
765+
<<<<<<< HEAD
752766
MQCD_LENGTH_10 int32 = 1920
753767
MQCD_LENGTH_11 int32 = 1984
754768
MQCD_LENGTH_2 int32 = 1312
@@ -759,6 +773,10 @@ var (
759773
MQCD_LENGTH_7 int32 = 1792
760774
MQCD_LENGTH_8 int32 = 1888
761775
MQCD_LENGTH_9 int32 = 1912
776+
=======
777+
MQCD_LENGTH_2 int32 = 1312
778+
MQCD_LENGTH_3 int32 = 1480
779+
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
762780
MQCD_VERSION_1 int32 = 1
763781
MQCD_VERSION_10 int32 = 10
764782
MQCD_VERSION_11 int32 = 11
@@ -979,7 +997,11 @@ var (
979997
MQCMDI_SEC_SIGNOFF_ERROR int32 = 17
980998
MQCMDI_SEC_TIMER_ZERO int32 = 14
981999
MQCMDI_SEC_UPPERCASE int32 = 21
1000+
<<<<<<< HEAD
9821001
MQCMDL_CURRENT_LEVEL int32 = 905
1002+
=======
1003+
MQCMDL_CURRENT_LEVEL int32 = 903
1004+
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
9831005
MQCMDL_LEVEL_1 int32 = 100
9841006
MQCMDL_LEVEL_101 int32 = 101
9851007
MQCMDL_LEVEL_110 int32 = 110
@@ -1012,8 +1034,11 @@ var (
10121034
MQCMDL_LEVEL_901 int32 = 901
10131035
MQCMDL_LEVEL_902 int32 = 902
10141036
MQCMDL_LEVEL_903 int32 = 903
1037+
<<<<<<< HEAD
10151038
MQCMDL_LEVEL_904 int32 = 904
10161039
MQCMDL_LEVEL_905 int32 = 905
1040+
=======
1041+
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
10171042
MQCMD_ACCOUNTING_MQI int32 = 167
10181043
MQCMD_ACCOUNTING_Q int32 = 168
10191044
MQCMD_ACTIVITY_MSG int32 = 69
@@ -1079,6 +1104,7 @@ var (
10791104
MQCMD_DELETE_BUFFER_POOL int32 = 157
10801105
MQCMD_DELETE_CF_STRUC int32 = 112
10811106
MQCMD_DELETE_CHANNEL int32 = 24
1107+
MQCMD_DELETE_CLIENTQMGRITEM int32 = 211
10821108
MQCMD_DELETE_COMM_INFO int32 = 194
10831109
MQCMD_DELETE_LISTENER int32 = 96
10841110
MQCMD_DELETE_NAMELIST int32 = 35
@@ -1108,6 +1134,7 @@ var (
11081134
MQCMD_INQUIRE_CHANNEL_NAMES int32 = 20
11091135
MQCMD_INQUIRE_CHANNEL_STATUS int32 = 42
11101136
MQCMD_INQUIRE_CHLAUTH_RECS int32 = 204
1137+
MQCMD_INQUIRE_CLIENTQMGRITEM int32 = 212
11111138
MQCMD_INQUIRE_CLUSTER_Q_MGR int32 = 70
11121139
MQCMD_INQUIRE_CMD_SERVER int32 = 117
11131140
MQCMD_INQUIRE_COMM_INFO int32 = 191
@@ -1146,6 +1173,7 @@ var (
11461173
MQCMD_INQUIRE_TRACE int32 = 125
11471174
MQCMD_INQUIRE_USAGE int32 = 126
11481175
MQCMD_INQUIRE_XR_CAPABILITY int32 = 214
1176+
MQCMD_INSERT_CLIENTQMGRITEM int32 = 210
11491177
MQCMD_LOGGER_EVENT int32 = 91
11501178
MQCMD_MOVE_Q int32 = 127
11511179
MQCMD_MQXR_DIAGNOSTICS int32 = 196
@@ -1232,11 +1260,14 @@ var (
12321260
MQCNO_HANDLE_SHARE_NO_BLOCK int32 = 128
12331261
MQCNO_ISOLATED_BINDING int32 = 512
12341262
MQCNO_LENGTH_1 int32 = 12
1263+
<<<<<<< HEAD
12351264
MQCNO_LENGTH_2 int32 = 24
12361265
MQCNO_LENGTH_3 int32 = 152
12371266
MQCNO_LENGTH_4 int32 = 168
12381267
MQCNO_LENGTH_5 int32 = 200
12391268
MQCNO_LENGTH_6 int32 = 224
1269+
=======
1270+
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
12401271
MQCNO_LOCAL_BINDING int32 = 1024
12411272
MQCNO_NONE int32 = 0
12421273
MQCNO_NO_CONV_SHARING int32 = 65536
@@ -1331,10 +1362,13 @@ var (
13311362
MQCXP_LENGTH_3 int32 = 156
13321363
MQCXP_LENGTH_4 int32 = 156
13331364
MQCXP_LENGTH_5 int32 = 160
1365+
<<<<<<< HEAD
13341366
MQCXP_LENGTH_6 int32 = 200
13351367
MQCXP_LENGTH_7 int32 = 208
13361368
MQCXP_LENGTH_8 int32 = 224
13371369
MQCXP_LENGTH_9 int32 = 240
1370+
=======
1371+
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
13381372
MQCXP_VERSION_1 int32 = 1
13391373
MQCXP_VERSION_2 int32 = 2
13401374
MQCXP_VERSION_3 int32 = 3
@@ -1415,7 +1449,10 @@ var (
14151449
MQDXP_CURRENT_LENGTH int32 = 56
14161450
MQDXP_CURRENT_VERSION int32 = 2
14171451
MQDXP_LENGTH_1 int32 = 44
1452+
<<<<<<< HEAD
14181453
MQDXP_LENGTH_2 int32 = 56
1454+
=======
1455+
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
14191456
MQDXP_VERSION_1 int32 = 1
14201457
MQDXP_VERSION_2 int32 = 2
14211458
MQEC_CONNECTION_QUIESCING int32 = 6
@@ -2393,7 +2430,11 @@ var (
23932430
MQIA_IP_ADDRESS_VERSION int32 = 93
23942431
MQIA_KEY_REUSE_COUNT int32 = 267
23952432
MQIA_LAST int32 = 2000
2433+
<<<<<<< HEAD
23962434
MQIA_LAST_USED int32 = 273
2435+
=======
2436+
MQIA_LAST_USED int32 = 272
2437+
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
23972438
MQIA_LDAP_AUTHORMD int32 = 263
23982439
MQIA_LDAP_NESTGRP int32 = 264
23992440
MQIA_LDAP_SECURE_COMM int32 = 261
@@ -2781,9 +2822,12 @@ var (
27812822
MQOD_CURRENT_LENGTH int32 = 424
27822823
MQOD_CURRENT_VERSION int32 = 4
27832824
MQOD_LENGTH_1 int32 = 168
2825+
<<<<<<< HEAD
27842826
MQOD_LENGTH_2 int32 = 208
27852827
MQOD_LENGTH_3 int32 = 344
27862828
MQOD_LENGTH_4 int32 = 424
2829+
=======
2830+
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
27872831
MQOD_VERSION_1 int32 = 1
27882832
MQOD_VERSION_2 int32 = 2
27892833
MQOD_VERSION_3 int32 = 3
@@ -2931,8 +2975,11 @@ var (
29312975
MQPMO_DEFAULT_CONTEXT int32 = 32
29322976
MQPMO_FAIL_IF_QUIESCING int32 = 8192
29332977
MQPMO_LENGTH_1 int32 = 128
2978+
<<<<<<< HEAD
29342979
MQPMO_LENGTH_2 int32 = 160
29352980
MQPMO_LENGTH_3 int32 = 184
2981+
=======
2982+
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
29362983
MQPMO_LOGICAL_ORDER int32 = 32768
29372984
MQPMO_MD_FOR_OUTPUT_ONLY int32 = 8388608
29382985
MQPMO_NEW_CORREL_ID int32 = 128
@@ -4281,7 +4328,10 @@ var (
42814328
MQSTS_CURRENT_LENGTH int32 = 280
42824329
MQSTS_CURRENT_VERSION int32 = 2
42834330
MQSTS_LENGTH_1 int32 = 224
4331+
<<<<<<< HEAD
42844332
MQSTS_LENGTH_2 int32 = 280
4333+
=======
4334+
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
42854335
MQSTS_VERSION_1 int32 = 1
42864336
MQSTS_VERSION_2 int32 = 2
42874337
MQSUBTYPE_ADMIN int32 = 2

‎ibmmq/cmqc_windows.go‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package ibmmq
22

33
/*
4+
<<<<<<< HEAD
45
****************************************************************
56
*
67
* IBM MQ for Windows
@@ -36,6 +37,13 @@ package ibmmq
3637
* Pointer Size: 64 Bit
3738
* <END_BUILDINFO>
3839
*/
40+
=======
41+
This file was generated from ./cmqstrc.h.903.amd64_nt_4 using
42+
the hdr.sh script.
43+
It is used for 64-bit applications.
44+
*/
45+
46+
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
3947
var (
4048
MQACH_CURRENT_LENGTH int32 = 72
4149
MQACH_CURRENT_VERSION int32 = 1
@@ -723,6 +731,7 @@ var (
723731
MQCDC_CURRENT_LENGTH int32 = 1984
724732
MQCDC_CURRENT_VERSION int32 = 11
725733
MQCDC_LENGTH_1 int32 = 984
734+
<<<<<<< HEAD
726735
MQCDC_LENGTH_10 int32 = 1920
727736
MQCDC_LENGTH_11 int32 = 1984
728737
MQCDC_LENGTH_2 int32 = 1312
@@ -733,6 +742,10 @@ var (
733742
MQCDC_LENGTH_7 int32 = 1792
734743
MQCDC_LENGTH_8 int32 = 1888
735744
MQCDC_LENGTH_9 int32 = 1912
745+
=======
746+
MQCDC_LENGTH_2 int32 = 1312
747+
MQCDC_LENGTH_3 int32 = 1480
748+
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
736749
MQCDC_NO_SENDER_CONVERSION int32 = 0
737750
MQCDC_SENDER_CONVERSION int32 = 1
738751
MQCDC_VERSION_1 int32 = 1
@@ -749,6 +762,7 @@ var (
749762
MQCD_CURRENT_LENGTH int32 = 1984
750763
MQCD_CURRENT_VERSION int32 = 11
751764
MQCD_LENGTH_1 int32 = 984
765+
<<<<<<< HEAD
752766
MQCD_LENGTH_10 int32 = 1920
753767
MQCD_LENGTH_11 int32 = 1984
754768
MQCD_LENGTH_2 int32 = 1312
@@ -759,6 +773,10 @@ var (
759773
MQCD_LENGTH_7 int32 = 1792
760774
MQCD_LENGTH_8 int32 = 1888
761775
MQCD_LENGTH_9 int32 = 1912
776+
=======
777+
MQCD_LENGTH_2 int32 = 1312
778+
MQCD_LENGTH_3 int32 = 1480
779+
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
762780
MQCD_VERSION_1 int32 = 1
763781
MQCD_VERSION_10 int32 = 10
764782
MQCD_VERSION_11 int32 = 11
@@ -979,7 +997,11 @@ var (
979997
MQCMDI_SEC_SIGNOFF_ERROR int32 = 17
980998
MQCMDI_SEC_TIMER_ZERO int32 = 14
981999
MQCMDI_SEC_UPPERCASE int32 = 21
1000+
<<<<<<< HEAD
9821001
MQCMDL_CURRENT_LEVEL int32 = 905
1002+
=======
1003+
MQCMDL_CURRENT_LEVEL int32 = 903
1004+
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
9831005
MQCMDL_LEVEL_1 int32 = 100
9841006
MQCMDL_LEVEL_101 int32 = 101
9851007
MQCMDL_LEVEL_110 int32 = 110
@@ -1012,8 +1034,11 @@ var (
10121034
MQCMDL_LEVEL_901 int32 = 901
10131035
MQCMDL_LEVEL_902 int32 = 902
10141036
MQCMDL_LEVEL_903 int32 = 903
1037+
<<<<<<< HEAD
10151038
MQCMDL_LEVEL_904 int32 = 904
10161039
MQCMDL_LEVEL_905 int32 = 905
1040+
=======
1041+
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
10171042
MQCMD_ACCOUNTING_MQI int32 = 167
10181043
MQCMD_ACCOUNTING_Q int32 = 168
10191044
MQCMD_ACTIVITY_MSG int32 = 69
@@ -1232,11 +1257,14 @@ var (
12321257
MQCNO_HANDLE_SHARE_NO_BLOCK int32 = 128
12331258
MQCNO_ISOLATED_BINDING int32 = 512
12341259
MQCNO_LENGTH_1 int32 = 12
1260+
<<<<<<< HEAD
12351261
MQCNO_LENGTH_2 int32 = 24
12361262
MQCNO_LENGTH_3 int32 = 152
12371263
MQCNO_LENGTH_4 int32 = 168
12381264
MQCNO_LENGTH_5 int32 = 200
12391265
MQCNO_LENGTH_6 int32 = 224
1266+
=======
1267+
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
12401268
MQCNO_LOCAL_BINDING int32 = 1024
12411269
MQCNO_NONE int32 = 0
12421270
MQCNO_NO_CONV_SHARING int32 = 65536
@@ -1331,10 +1359,13 @@ var (
13311359
MQCXP_LENGTH_3 int32 = 156
13321360
MQCXP_LENGTH_4 int32 = 156
13331361
MQCXP_LENGTH_5 int32 = 160
1362+
<<<<<<< HEAD
13341363
MQCXP_LENGTH_6 int32 = 200
13351364
MQCXP_LENGTH_7 int32 = 208
13361365
MQCXP_LENGTH_8 int32 = 224
13371366
MQCXP_LENGTH_9 int32 = 240
1367+
=======
1368+
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
13381369
MQCXP_VERSION_1 int32 = 1
13391370
MQCXP_VERSION_2 int32 = 2
13401371
MQCXP_VERSION_3 int32 = 3
@@ -1415,7 +1446,10 @@ var (
14151446
MQDXP_CURRENT_LENGTH int32 = 56
14161447
MQDXP_CURRENT_VERSION int32 = 2
14171448
MQDXP_LENGTH_1 int32 = 44
1449+
<<<<<<< HEAD
14181450
MQDXP_LENGTH_2 int32 = 56
1451+
=======
1452+
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
14191453
MQDXP_VERSION_1 int32 = 1
14201454
MQDXP_VERSION_2 int32 = 2
14211455
MQEC_CONNECTION_QUIESCING int32 = 6
@@ -2393,7 +2427,11 @@ var (
23932427
MQIA_IP_ADDRESS_VERSION int32 = 93
23942428
MQIA_KEY_REUSE_COUNT int32 = 267
23952429
MQIA_LAST int32 = 2000
2430+
<<<<<<< HEAD
23962431
MQIA_LAST_USED int32 = 273
2432+
=======
2433+
MQIA_LAST_USED int32 = 272
2434+
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
23972435
MQIA_LDAP_AUTHORMD int32 = 263
23982436
MQIA_LDAP_NESTGRP int32 = 264
23992437
MQIA_LDAP_SECURE_COMM int32 = 261
@@ -2781,9 +2819,12 @@ var (
27812819
MQOD_CURRENT_LENGTH int32 = 424
27822820
MQOD_CURRENT_VERSION int32 = 4
27832821
MQOD_LENGTH_1 int32 = 168
2822+
<<<<<<< HEAD
27842823
MQOD_LENGTH_2 int32 = 208
27852824
MQOD_LENGTH_3 int32 = 344
27862825
MQOD_LENGTH_4 int32 = 424
2826+
=======
2827+
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
27872828
MQOD_VERSION_1 int32 = 1
27882829
MQOD_VERSION_2 int32 = 2
27892830
MQOD_VERSION_3 int32 = 3
@@ -2931,8 +2972,11 @@ var (
29312972
MQPMO_DEFAULT_CONTEXT int32 = 32
29322973
MQPMO_FAIL_IF_QUIESCING int32 = 8192
29332974
MQPMO_LENGTH_1 int32 = 128
2975+
<<<<<<< HEAD
29342976
MQPMO_LENGTH_2 int32 = 160
29352977
MQPMO_LENGTH_3 int32 = 184
2978+
=======
2979+
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
29362980
MQPMO_LOGICAL_ORDER int32 = 32768
29372981
MQPMO_MD_FOR_OUTPUT_ONLY int32 = 8388608
29382982
MQPMO_NEW_CORREL_ID int32 = 128
@@ -4281,7 +4325,10 @@ var (
42814325
MQSTS_CURRENT_LENGTH int32 = 280
42824326
MQSTS_CURRENT_VERSION int32 = 2
42834327
MQSTS_LENGTH_1 int32 = 224
4328+
<<<<<<< HEAD
42844329
MQSTS_LENGTH_2 int32 = 280
4330+
=======
4331+
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
42854332
MQSTS_VERSION_1 int32 = 1
42864333
MQSTS_VERSION_2 int32 = 2
42874334
MQSUBTYPE_ADMIN int32 = 2

‎mqmetric/mqif.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,11 @@ func getMessageWithHObj(wait bool, hObj ibmmq.MQObject) ([]byte, error) {
200200
gmo.WaitInterval = 30 * 1000
201201
}
202202

203+
<<<<<<< HEAD
203204
datalen, err = hObj.Get(getmqmd, gmo, getBuffer)
205+
=======
206+
datalen, err = replyQObj.Get(getmqmd, gmo, getBuffer)
207+
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
204208
if err != nil {
205209
mqreturn = err.(*ibmmq.MQReturn)
206210

0 commit comments

Comments
 (0)