Skip to content

Commit e355699

Browse files
ibmmqmetibmmqmet
committed
merge
1 parent dfcc0ed commit e355699

File tree

3 files changed

+0
-96
lines changed

3 files changed

+0
-96
lines changed

‎ibmmq/cmqc_linux.go

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

33
/*
4-
<<<<<<< HEAD
54
****************************************************************
65
*
76
* IBM MQ for LinuxIntel
@@ -37,13 +36,7 @@ package ibmmq
3736
* Pointer Size: 64 Bit
3837
* <END_BUILDINFO>
3938
*/
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-
*/
4539

46-
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
4740
var (
4841
MQACH_CURRENT_LENGTH int32 = 72
4942
MQACH_CURRENT_VERSION int32 = 1
@@ -731,7 +724,6 @@ var (
731724
MQCDC_CURRENT_LENGTH int32 = 1984
732725
MQCDC_CURRENT_VERSION int32 = 11
733726
MQCDC_LENGTH_1 int32 = 984
734-
<<<<<<< HEAD
735727
MQCDC_LENGTH_10 int32 = 1920
736728
MQCDC_LENGTH_11 int32 = 1984
737729
MQCDC_LENGTH_2 int32 = 1312
@@ -742,10 +734,6 @@ var (
742734
MQCDC_LENGTH_7 int32 = 1792
743735
MQCDC_LENGTH_8 int32 = 1888
744736
MQCDC_LENGTH_9 int32 = 1912
745-
=======
746-
MQCDC_LENGTH_2 int32 = 1312
747-
MQCDC_LENGTH_3 int32 = 1480
748-
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
749737
MQCDC_NO_SENDER_CONVERSION int32 = 0
750738
MQCDC_SENDER_CONVERSION int32 = 1
751739
MQCDC_VERSION_1 int32 = 1
@@ -762,7 +750,6 @@ var (
762750
MQCD_CURRENT_LENGTH int32 = 1984
763751
MQCD_CURRENT_VERSION int32 = 11
764752
MQCD_LENGTH_1 int32 = 984
765-
<<<<<<< HEAD
766753
MQCD_LENGTH_10 int32 = 1920
767754
MQCD_LENGTH_11 int32 = 1984
768755
MQCD_LENGTH_2 int32 = 1312
@@ -773,10 +760,6 @@ var (
773760
MQCD_LENGTH_7 int32 = 1792
774761
MQCD_LENGTH_8 int32 = 1888
775762
MQCD_LENGTH_9 int32 = 1912
776-
=======
777-
MQCD_LENGTH_2 int32 = 1312
778-
MQCD_LENGTH_3 int32 = 1480
779-
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
780763
MQCD_VERSION_1 int32 = 1
781764
MQCD_VERSION_10 int32 = 10
782765
MQCD_VERSION_11 int32 = 11
@@ -997,11 +980,7 @@ var (
997980
MQCMDI_SEC_SIGNOFF_ERROR int32 = 17
998981
MQCMDI_SEC_TIMER_ZERO int32 = 14
999982
MQCMDI_SEC_UPPERCASE int32 = 21
1000-
<<<<<<< HEAD
1001983
MQCMDL_CURRENT_LEVEL int32 = 905
1002-
=======
1003-
MQCMDL_CURRENT_LEVEL int32 = 903
1004-
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
1005984
MQCMDL_LEVEL_1 int32 = 100
1006985
MQCMDL_LEVEL_101 int32 = 101
1007986
MQCMDL_LEVEL_110 int32 = 110
@@ -1034,11 +1013,8 @@ var (
10341013
MQCMDL_LEVEL_901 int32 = 901
10351014
MQCMDL_LEVEL_902 int32 = 902
10361015
MQCMDL_LEVEL_903 int32 = 903
1037-
<<<<<<< HEAD
10381016
MQCMDL_LEVEL_904 int32 = 904
10391017
MQCMDL_LEVEL_905 int32 = 905
1040-
=======
1041-
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
10421018
MQCMD_ACCOUNTING_MQI int32 = 167
10431019
MQCMD_ACCOUNTING_Q int32 = 168
10441020
MQCMD_ACTIVITY_MSG int32 = 69
@@ -1260,14 +1236,11 @@ var (
12601236
MQCNO_HANDLE_SHARE_NO_BLOCK int32 = 128
12611237
MQCNO_ISOLATED_BINDING int32 = 512
12621238
MQCNO_LENGTH_1 int32 = 12
1263-
<<<<<<< HEAD
12641239
MQCNO_LENGTH_2 int32 = 24
12651240
MQCNO_LENGTH_3 int32 = 152
12661241
MQCNO_LENGTH_4 int32 = 168
12671242
MQCNO_LENGTH_5 int32 = 200
12681243
MQCNO_LENGTH_6 int32 = 224
1269-
=======
1270-
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
12711244
MQCNO_LOCAL_BINDING int32 = 1024
12721245
MQCNO_NONE int32 = 0
12731246
MQCNO_NO_CONV_SHARING int32 = 65536
@@ -1362,13 +1335,10 @@ var (
13621335
MQCXP_LENGTH_3 int32 = 156
13631336
MQCXP_LENGTH_4 int32 = 156
13641337
MQCXP_LENGTH_5 int32 = 160
1365-
<<<<<<< HEAD
13661338
MQCXP_LENGTH_6 int32 = 200
13671339
MQCXP_LENGTH_7 int32 = 208
13681340
MQCXP_LENGTH_8 int32 = 224
13691341
MQCXP_LENGTH_9 int32 = 240
1370-
=======
1371-
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
13721342
MQCXP_VERSION_1 int32 = 1
13731343
MQCXP_VERSION_2 int32 = 2
13741344
MQCXP_VERSION_3 int32 = 3
@@ -1449,10 +1419,7 @@ var (
14491419
MQDXP_CURRENT_LENGTH int32 = 56
14501420
MQDXP_CURRENT_VERSION int32 = 2
14511421
MQDXP_LENGTH_1 int32 = 44
1452-
<<<<<<< HEAD
14531422
MQDXP_LENGTH_2 int32 = 56
1454-
=======
1455-
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
14561423
MQDXP_VERSION_1 int32 = 1
14571424
MQDXP_VERSION_2 int32 = 2
14581425
MQEC_CONNECTION_QUIESCING int32 = 6
@@ -2430,11 +2397,7 @@ var (
24302397
MQIA_IP_ADDRESS_VERSION int32 = 93
24312398
MQIA_KEY_REUSE_COUNT int32 = 267
24322399
MQIA_LAST int32 = 2000
2433-
<<<<<<< HEAD
24342400
MQIA_LAST_USED int32 = 273
2435-
=======
2436-
MQIA_LAST_USED int32 = 272
2437-
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
24382401
MQIA_LDAP_AUTHORMD int32 = 263
24392402
MQIA_LDAP_NESTGRP int32 = 264
24402403
MQIA_LDAP_SECURE_COMM int32 = 261
@@ -2822,12 +2785,9 @@ var (
28222785
MQOD_CURRENT_LENGTH int32 = 424
28232786
MQOD_CURRENT_VERSION int32 = 4
28242787
MQOD_LENGTH_1 int32 = 168
2825-
<<<<<<< HEAD
28262788
MQOD_LENGTH_2 int32 = 208
28272789
MQOD_LENGTH_3 int32 = 344
28282790
MQOD_LENGTH_4 int32 = 424
2829-
=======
2830-
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
28312791
MQOD_VERSION_1 int32 = 1
28322792
MQOD_VERSION_2 int32 = 2
28332793
MQOD_VERSION_3 int32 = 3
@@ -2975,11 +2935,8 @@ var (
29752935
MQPMO_DEFAULT_CONTEXT int32 = 32
29762936
MQPMO_FAIL_IF_QUIESCING int32 = 8192
29772937
MQPMO_LENGTH_1 int32 = 128
2978-
<<<<<<< HEAD
29792938
MQPMO_LENGTH_2 int32 = 160
29802939
MQPMO_LENGTH_3 int32 = 184
2981-
=======
2982-
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
29832940
MQPMO_LOGICAL_ORDER int32 = 32768
29842941
MQPMO_MD_FOR_OUTPUT_ONLY int32 = 8388608
29852942
MQPMO_NEW_CORREL_ID int32 = 128
@@ -4328,10 +4285,7 @@ var (
43284285
MQSTS_CURRENT_LENGTH int32 = 280
43294286
MQSTS_CURRENT_VERSION int32 = 2
43304287
MQSTS_LENGTH_1 int32 = 224
4331-
<<<<<<< HEAD
43324288
MQSTS_LENGTH_2 int32 = 280
4333-
=======
4334-
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
43354289
MQSTS_VERSION_1 int32 = 1
43364290
MQSTS_VERSION_2 int32 = 2
43374291
MQSUBTYPE_ADMIN int32 = 2

‎ibmmq/cmqc_windows.go

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

33
/*
4-
<<<<<<< HEAD
54
****************************************************************
65
*
76
* IBM MQ for Windows
@@ -37,13 +36,7 @@ package ibmmq
3736
* Pointer Size: 64 Bit
3837
* <END_BUILDINFO>
3938
*/
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-
*/
4539

46-
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
4740
var (
4841
MQACH_CURRENT_LENGTH int32 = 72
4942
MQACH_CURRENT_VERSION int32 = 1
@@ -731,7 +724,6 @@ var (
731724
MQCDC_CURRENT_LENGTH int32 = 1984
732725
MQCDC_CURRENT_VERSION int32 = 11
733726
MQCDC_LENGTH_1 int32 = 984
734-
<<<<<<< HEAD
735727
MQCDC_LENGTH_10 int32 = 1920
736728
MQCDC_LENGTH_11 int32 = 1984
737729
MQCDC_LENGTH_2 int32 = 1312
@@ -742,10 +734,6 @@ var (
742734
MQCDC_LENGTH_7 int32 = 1792
743735
MQCDC_LENGTH_8 int32 = 1888
744736
MQCDC_LENGTH_9 int32 = 1912
745-
=======
746-
MQCDC_LENGTH_2 int32 = 1312
747-
MQCDC_LENGTH_3 int32 = 1480
748-
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
749737
MQCDC_NO_SENDER_CONVERSION int32 = 0
750738
MQCDC_SENDER_CONVERSION int32 = 1
751739
MQCDC_VERSION_1 int32 = 1
@@ -762,7 +750,6 @@ var (
762750
MQCD_CURRENT_LENGTH int32 = 1984
763751
MQCD_CURRENT_VERSION int32 = 11
764752
MQCD_LENGTH_1 int32 = 984
765-
<<<<<<< HEAD
766753
MQCD_LENGTH_10 int32 = 1920
767754
MQCD_LENGTH_11 int32 = 1984
768755
MQCD_LENGTH_2 int32 = 1312
@@ -773,10 +760,6 @@ var (
773760
MQCD_LENGTH_7 int32 = 1792
774761
MQCD_LENGTH_8 int32 = 1888
775762
MQCD_LENGTH_9 int32 = 1912
776-
=======
777-
MQCD_LENGTH_2 int32 = 1312
778-
MQCD_LENGTH_3 int32 = 1480
779-
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
780763
MQCD_VERSION_1 int32 = 1
781764
MQCD_VERSION_10 int32 = 10
782765
MQCD_VERSION_11 int32 = 11
@@ -997,11 +980,7 @@ var (
997980
MQCMDI_SEC_SIGNOFF_ERROR int32 = 17
998981
MQCMDI_SEC_TIMER_ZERO int32 = 14
999982
MQCMDI_SEC_UPPERCASE int32 = 21
1000-
<<<<<<< HEAD
1001983
MQCMDL_CURRENT_LEVEL int32 = 905
1002-
=======
1003-
MQCMDL_CURRENT_LEVEL int32 = 903
1004-
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
1005984
MQCMDL_LEVEL_1 int32 = 100
1006985
MQCMDL_LEVEL_101 int32 = 101
1007986
MQCMDL_LEVEL_110 int32 = 110
@@ -1034,11 +1013,8 @@ var (
10341013
MQCMDL_LEVEL_901 int32 = 901
10351014
MQCMDL_LEVEL_902 int32 = 902
10361015
MQCMDL_LEVEL_903 int32 = 903
1037-
<<<<<<< HEAD
10381016
MQCMDL_LEVEL_904 int32 = 904
10391017
MQCMDL_LEVEL_905 int32 = 905
1040-
=======
1041-
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
10421018
MQCMD_ACCOUNTING_MQI int32 = 167
10431019
MQCMD_ACCOUNTING_Q int32 = 168
10441020
MQCMD_ACTIVITY_MSG int32 = 69
@@ -1257,14 +1233,11 @@ var (
12571233
MQCNO_HANDLE_SHARE_NO_BLOCK int32 = 128
12581234
MQCNO_ISOLATED_BINDING int32 = 512
12591235
MQCNO_LENGTH_1 int32 = 12
1260-
<<<<<<< HEAD
12611236
MQCNO_LENGTH_2 int32 = 24
12621237
MQCNO_LENGTH_3 int32 = 152
12631238
MQCNO_LENGTH_4 int32 = 168
12641239
MQCNO_LENGTH_5 int32 = 200
12651240
MQCNO_LENGTH_6 int32 = 224
1266-
=======
1267-
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
12681241
MQCNO_LOCAL_BINDING int32 = 1024
12691242
MQCNO_NONE int32 = 0
12701243
MQCNO_NO_CONV_SHARING int32 = 65536
@@ -1359,13 +1332,10 @@ var (
13591332
MQCXP_LENGTH_3 int32 = 156
13601333
MQCXP_LENGTH_4 int32 = 156
13611334
MQCXP_LENGTH_5 int32 = 160
1362-
<<<<<<< HEAD
13631335
MQCXP_LENGTH_6 int32 = 200
13641336
MQCXP_LENGTH_7 int32 = 208
13651337
MQCXP_LENGTH_8 int32 = 224
13661338
MQCXP_LENGTH_9 int32 = 240
1367-
=======
1368-
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
13691339
MQCXP_VERSION_1 int32 = 1
13701340
MQCXP_VERSION_2 int32 = 2
13711341
MQCXP_VERSION_3 int32 = 3
@@ -1446,10 +1416,7 @@ var (
14461416
MQDXP_CURRENT_LENGTH int32 = 56
14471417
MQDXP_CURRENT_VERSION int32 = 2
14481418
MQDXP_LENGTH_1 int32 = 44
1449-
<<<<<<< HEAD
14501419
MQDXP_LENGTH_2 int32 = 56
1451-
=======
1452-
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
14531420
MQDXP_VERSION_1 int32 = 1
14541421
MQDXP_VERSION_2 int32 = 2
14551422
MQEC_CONNECTION_QUIESCING int32 = 6
@@ -2427,11 +2394,7 @@ var (
24272394
MQIA_IP_ADDRESS_VERSION int32 = 93
24282395
MQIA_KEY_REUSE_COUNT int32 = 267
24292396
MQIA_LAST int32 = 2000
2430-
<<<<<<< HEAD
24312397
MQIA_LAST_USED int32 = 273
2432-
=======
2433-
MQIA_LAST_USED int32 = 272
2434-
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
24352398
MQIA_LDAP_AUTHORMD int32 = 263
24362399
MQIA_LDAP_NESTGRP int32 = 264
24372400
MQIA_LDAP_SECURE_COMM int32 = 261
@@ -2819,12 +2782,9 @@ var (
28192782
MQOD_CURRENT_LENGTH int32 = 424
28202783
MQOD_CURRENT_VERSION int32 = 4
28212784
MQOD_LENGTH_1 int32 = 168
2822-
<<<<<<< HEAD
28232785
MQOD_LENGTH_2 int32 = 208
28242786
MQOD_LENGTH_3 int32 = 344
28252787
MQOD_LENGTH_4 int32 = 424
2826-
=======
2827-
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
28282788
MQOD_VERSION_1 int32 = 1
28292789
MQOD_VERSION_2 int32 = 2
28302790
MQOD_VERSION_3 int32 = 3
@@ -2972,11 +2932,8 @@ var (
29722932
MQPMO_DEFAULT_CONTEXT int32 = 32
29732933
MQPMO_FAIL_IF_QUIESCING int32 = 8192
29742934
MQPMO_LENGTH_1 int32 = 128
2975-
<<<<<<< HEAD
29762935
MQPMO_LENGTH_2 int32 = 160
29772936
MQPMO_LENGTH_3 int32 = 184
2978-
=======
2979-
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
29802937
MQPMO_LOGICAL_ORDER int32 = 32768
29812938
MQPMO_MD_FOR_OUTPUT_ONLY int32 = 8388608
29822939
MQPMO_NEW_CORREL_ID int32 = 128
@@ -4325,10 +4282,7 @@ var (
43254282
MQSTS_CURRENT_LENGTH int32 = 280
43264283
MQSTS_CURRENT_VERSION int32 = 2
43274284
MQSTS_LENGTH_1 int32 = 224
4328-
<<<<<<< HEAD
43294285
MQSTS_LENGTH_2 int32 = 280
4330-
=======
4331-
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
43324286
MQSTS_VERSION_1 int32 = 1
43334287
MQSTS_VERSION_2 int32 = 2
43344288
MQSUBTYPE_ADMIN int32 = 2

‎mqmetric/mqif.go

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

203-
<<<<<<< HEAD
204-
datalen, err = hObj.Get(getmqmd, gmo, getBuffer)
205-
=======
206203
datalen, err = replyQObj.Get(getmqmd, gmo, getBuffer)
207-
>>>>>>> c44b74e0cfbde3afbbf7bc3ac939a9bdf757db2e
208204
if err != nil {
209205
mqreturn = err.(*ibmmq.MQReturn)
210206

0 commit comments

Comments
 (0)