@@ -138,7 +138,7 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongToIntPtr, ULONG, INT_PTR)
138
138
__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV (ULongToPtrdiffT , ULONG , ptrdiff_t )
139
139
__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV (ULongToLongPtr , ULONG , LONG_PTR )
140
140
__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV (ULongToSSIZET , ULONG , SSIZE_T )
141
- __MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV (ULongToChar , ULONG , CHAR )
141
+ __MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR (ULongToChar , ULONG , CHAR )
142
142
__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR (DWordToUChar , DWORD , UCHAR )
143
143
__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV (DWordToByte , DWORD , BYTE )
144
144
__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV (DWordToUShort , DWORD , USHORT )
@@ -426,9 +426,7 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul)
426
426
#define Int8ToUInt64 Int8ToULongLong
427
427
#define Int8ToSizeT Int8ToUIntPtr
428
428
#define Int8ToSIZET Int8ToULongPtr
429
- #define ShortToByte ShortToUInt8
430
429
#define ShortToUInt16 ShortToUShort
431
- #define ShortToWord ShortToUShort
432
430
#define ShortToUInt32 ShortToUInt
433
431
#define ShortToDWord ShortToULong
434
432
#define ShortToDWordLong ShortToULongLong
@@ -459,7 +457,6 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul)
459
457
#define Int16ToUInt64 ShortToULongLong
460
458
#define Int16ToSizeT ShortToUIntPtr
461
459
#define Int16ToSIZET ShortToULongPtr
462
- #define UShortToByte UShortToUInt8
463
460
#define UShortToInt16 UShortToShort
464
461
#define UInt16ToChar UShortToChar
465
462
#define UInt16ToInt8 UShortToInt8
@@ -469,27 +466,14 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul)
469
466
#define UInt16ToShort UShortToShort
470
467
#define UInt16ToInt16 UShortToShort
471
468
#define WordToInt8 UShortToInt8
472
- #define WordToChar UShortToChar
473
- #define WordToUChar UShortToUChar
474
469
#define WordToUInt8 UShortToUInt8
475
- #define WordToByte UShortToUInt8
476
- #define WordToShort UShortToShort
477
470
#define WordToInt16 UShortToShort
478
- #define IntToByte IntToUInt8
479
471
#define IntToInt16 IntToShort
480
472
#define IntToUInt16 IntToUShort
481
- #define IntToWord IntToUShort
482
- #define IntToUIntPtr IntToULongLong
483
- #define IntToUIntPtr IntToUInt
484
- #define IntToULongPtr IntToULongLong
485
- #define IntToULongPtr IntToULong
486
- #define IntToDWord IntToULong
487
- #define IntToDWordPtr IntToULongPtr
488
473
#define IntToDWordLong IntToULongLong
489
474
#define IntToULong64 IntToULongLong
490
475
#define IntToDWord64 IntToULongLong
491
476
#define IntToUInt64 IntToULongLong
492
- #define IntToSizeT IntToUIntPtr
493
477
#define IntToSIZET IntToULongPtr
494
478
#define Int32ToChar IntToChar
495
479
#define Int32ToInt8 IntToInt8
@@ -519,32 +503,16 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul)
519
503
#define IntPtrToInt16 IntPtrToShort
520
504
#define IntPtrToUInt16 IntPtrToUShort
521
505
#define IntPtrToWord IntPtrToUShort
522
- #define IntPtrToInt LongLongToInt
523
506
#define IntPtrToInt32 IntPtrToInt
524
- #define IntPtrToUInt LongLongToUInt
525
507
#define IntPtrToUInt32 IntPtrToUInt
526
- #define IntPtrToUIntPtr LongLongToULongLong
527
- #define IntPtrToLong LongLongToLong
528
- #define IntPtrToULong LongLongToULong
529
- #define IntPtrToULongPtr LongLongToULongLong
530
- #define IntPtrToDWord IntPtrToULong
531
- #define IntPtrToDWordPtr IntPtrToULongPtr
532
- #define IntPtrToULongLong LongLongToULongLong
533
508
#define IntPtrToDWordLong IntPtrToULongLong
534
509
#define IntPtrToULong64 IntPtrToULongLong
535
510
#define IntPtrToDWord64 IntPtrToULongLong
536
511
#define IntPtrToUInt64 IntPtrToULongLong
537
- #define IntPtrToSizeT IntPtrToUIntPtr
538
512
#define IntPtrToSIZET IntPtrToULongPtr
539
- #define UIntToByte UIntToUInt8
540
513
#define UIntToInt16 UIntToShort
541
514
#define UIntToUInt16 UIntToUShort
542
- #define UIntToWord UIntToUShort
543
515
#define UIntToInt32 UIntToInt
544
- #define UIntToIntPtr UIntToInt
545
- #define UIntToLongPtr UIntToLong
546
- #define UIntToPtrdiffT UIntToIntPtr
547
- #define UIntToSSIZET UIntToLongPtr
548
516
#define UInt32ToChar UIntToChar
549
517
#define UInt32ToInt8 UIntToInt8
550
518
#define UInt32ToUChar UIntToUChar
@@ -565,96 +533,46 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul)
565
533
#define UIntPtrToByte UIntPtrToUInt8
566
534
#define UIntPtrToWord UIntPtrToUShort
567
535
#define UIntPtrToInt32 UIntPtrToInt
568
- #define UIntPtrToUInt ULongLongToUInt
569
536
#define UIntPtrToUInt32 UIntPtrToUInt
570
- #define UIntPtrToULong ULongLongToULong
571
- #define UIntPtrToDWord UIntPtrToULong
572
- #define UIntPtrToLongLong ULongLongToLongLong
573
537
#define UIntPtrToLong64 UIntPtrToLongLong
574
- #define UIntPtrToInt64 UIntPtrToLongLong
575
538
#define UIntPtrToPtrdiffT UIntPtrToIntPtr
576
- #define UIntPtrToSSIZET UIntPtrToLongPtr
577
- #define LongToByte LongToUInt8
578
539
#define LongToInt16 LongToShort
579
540
#define LongToUInt16 LongToUShort
580
- #define LongToWord LongToUShort
581
541
#define LongToInt32 LongToInt
582
- #define LongToIntPtr LongToInt
583
542
#define LongToUInt32 LongToUInt
584
- #define LongToUIntPtr LongToUInt
585
- #define LongToULongPtr LongToULong
586
- #define LongToDWord LongToULong
587
- #define LongToDWordPtr LongToULongPtr
588
543
#define LongToDWordLong LongToULongLong
589
544
#define LongToULong64 LongToULongLong
590
545
#define LongToDWord64 LongToULongLong
591
546
#define LongToUInt64 LongToULongLong
592
- #define LongToPtrdiffT LongToIntPtr
593
- #define LongToSizeT LongToUIntPtr
594
547
#define LongToSIZET LongToULongPtr
595
548
#define LongPtrToByte LongPtrToUInt8
596
549
#define LongPtrToInt16 LongPtrToShort
597
550
#define LongPtrToUInt16 LongPtrToUShort
598
551
#define LongPtrToWord LongPtrToUShort
599
- #define LongPtrToInt LongLongToInt
600
552
#define LongPtrToInt32 LongPtrToInt
601
- #define LongPtrToUInt LongLongToUInt
602
553
#define LongPtrToUInt32 LongPtrToUInt
603
- #define LongPtrToLong LongLongToLong
604
- #define LongPtrToULong LongLongToULong
605
- #define LongPtrToDWord LongPtrToULong
606
- #define LongPtrToDWordPtr LongPtrToULongPtr
607
554
#define LongPtrToDWordLong LongPtrToULongLong
608
555
#define LongPtrToULong64 LongPtrToULongLong
609
556
#define LongPtrToDWord64 LongPtrToULongLong
610
557
#define LongPtrToUInt64 LongPtrToULongLong
611
- #define LongPtrToSizeT LongPtrToUIntPtr
612
558
#define LongPtrToSIZET LongPtrToULongPtr
613
- #define ULongToByte ULongToUInt8
614
559
#define ULongToInt16 ULongToShort
615
560
#define ULongToUInt16 ULongToUShort
616
- #define ULongToWord ULongToUShort
617
561
#define ULongToInt32 ULongToInt
618
- #define ULongToIntPtr ULongToInt
619
562
#define ULongToUInt32 ULongToUInt
620
- #define ULongToUIntPtr ULongToUInt
621
- #define ULongToLongPtr ULongToLong
622
- #define ULongToPtrdiffT ULongToIntPtr
623
- #define ULongToSSIZET ULongToLongPtr
624
563
#define ULongPtrToByte ULongPtrToUInt8
625
564
#define ULongPtrToInt16 ULongPtrToShort
626
565
#define ULongPtrToUInt16 ULongPtrToUShort
627
566
#define ULongPtrToWord ULongPtrToUShort
628
567
#define ULongPtrToInt32 ULongPtrToInt
629
- #define ULongPtrToUInt ULongLongToUInt
630
568
#define ULongPtrToUInt32 ULongPtrToUInt
631
- #define ULongPtrToULong ULongLongToULong
632
- #define ULongPtrToDWord ULongPtrToULong
633
- #define ULongPtrToLongLong ULongLongToLongLong
634
569
#define ULongPtrToLong64 ULongPtrToLongLong
635
- #define ULongPtrToInt64 ULongPtrToLongLong
636
- #define ULongPtrToPtrdiffT ULongPtrToIntPtr
637
- #define ULongPtrToSSIZET ULongPtrToLongPtr
638
570
#define DWordToInt8 ULongToInt8
639
- #define DWordToChar ULongToChar
640
- #define DWordToUChar ULongToUChar
641
571
#define DWordToUInt8 ULongToUInt8
642
- #define DWordToByte ULongToUInt8
643
- #define DWordToShort ULongToShort
644
572
#define DWordToInt16 ULongToShort
645
- #define DWordToUShort ULongToUShort
646
573
#define DWordToUInt16 ULongToUShort
647
- #define DWordToWord ULongToUShort
648
- #define DWordToInt ULongToInt
649
574
#define DWordToInt32 ULongToInt
650
- #define DWordToIntPtr ULongToIntPtr
651
- #define DWordToUInt ULongToUInt
652
575
#define DWordToUInt32 ULongToUInt
653
- #define DWordToUIntPtr ULongToUIntPtr
654
- #define DWordToLong ULongToLong
655
- #define DWordToLongPtr ULongToLongPtr
656
- #define DWordToPtrdiffT ULongToIntPtr
657
- #define DWordToSSIZET ULongToLongPtr
658
576
#define DWordPtrToInt8 ULongPtrToInt8
659
577
#define DWordPtrToUChar ULongPtrToUChar
660
578
#define DWordPtrToChar ULongPtrToChar
@@ -665,33 +583,18 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul)
665
583
#define DWordPtrToUShort ULongPtrToUShort
666
584
#define DWordPtrToUInt16 ULongPtrToUShort
667
585
#define DWordPtrToWord ULongPtrToUShort
668
- #define DWordPtrToInt ULongPtrToInt
669
586
#define DWordPtrToInt32 ULongPtrToInt
670
- #define DWordPtrToIntPtr ULongPtrToIntPtr
671
- #define DWordPtrToUInt ULongPtrToUInt
672
587
#define DWordPtrToUInt32 ULongPtrToUInt
673
- #define DWordPtrToUIntPtr ULongPtrToUIntPtr
674
- #define DWordPtrToLong ULongPtrToLong
675
- #define DWordPtrToLongPtr ULongPtrToLongPtr
676
- #define DWordPtrToULong ULongPtrToULong
677
- #define DWordPtrToDWord ULongPtrToULong
678
588
#define DWordPtrToLongLong ULongPtrToLongLong
679
589
#define DWordPtrToLong64 ULongPtrToLongLong
680
- #define DWordPtrToInt64 ULongPtrToLongLong
681
- #define DWordPtrToPtrdiffT ULongPtrToIntPtr
682
- #define DWordPtrToSSIZET ULongPtrToLongPtr
683
590
#define LongLongToByte LongLongToUInt8
684
591
#define LongLongToInt16 LongLongToShort
685
592
#define LongLongToUInt16 LongLongToUShort
686
593
#define LongLongToWord LongLongToUShort
687
594
#define LongLongToInt32 LongLongToInt
688
- #define LongLongToIntPtr LongLongToInt
689
595
#define LongLongToUInt32 LongLongToUInt
690
- #define LongLongToUIntPtr LongLongToULongLong
691
- #define LongLongToUIntPtr LongLongToUInt
692
- #define LongLongToLongPtr LongLongToLong
693
- #define LongLongToULongPtr LongLongToULongLong
694
- #define LongLongToULongPtr LongLongToULong
596
+ #define LongLongToUIntPtr Int64ToUIntPtr
597
+ #define LongLongToULongPtr Int64ToULongPtr
695
598
#define LongLongToDWord LongLongToULong
696
599
#define LongLongToDWordPtr LongLongToULongPtr
697
600
#define LongLongToDWordLong LongLongToULongLong
@@ -739,44 +642,20 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul)
739
642
#define Int64ToUShort LongLongToUShort
740
643
#define Int64ToUInt16 LongLongToUShort
741
644
#define Int64ToWord LongLongToUShort
742
- #define Int64ToInt LongLongToInt
743
645
#define Int64ToInt32 LongLongToInt
744
- #define Int64ToIntPtr LongLongToIntPtr
745
- #define Int64ToUInt LongLongToUInt
746
646
#define Int64ToUInt32 LongLongToUInt
747
- #define Int64ToUIntPtr LongLongToUIntPtr
748
- #define Int64ToLong LongLongToLong
749
- #define Int64ToLongPtr LongLongToLongPtr
750
- #define Int64ToULong LongLongToULong
751
- #define Int64ToULongPtr LongLongToULongPtr
752
- #define Int64ToDWord LongLongToULong
753
- #define Int64ToDWordPtr LongLongToULongPtr
754
- #define Int64ToULongLong LongLongToULongLong
755
647
#define Int64ToDWordLong LongLongToULongLong
756
648
#define Int64ToULong64 LongLongToULongLong
757
649
#define Int64ToDWord64 LongLongToULongLong
758
650
#define Int64ToUInt64 LongLongToULongLong
759
- #define Int64ToPtrdiffT LongLongToIntPtr
760
- #define Int64ToSizeT LongLongToUIntPtr
761
- #define Int64ToSSIZET LongLongToLongPtr
762
651
#define Int64ToSIZET LongLongToULongPtr
763
652
#define ULongLongToByte ULongLongToUInt8
764
653
#define ULongLongToInt16 ULongLongToShort
765
654
#define ULongLongToUInt16 ULongLongToUShort
766
655
#define ULongLongToWord ULongLongToUShort
767
656
#define ULongLongToInt32 ULongLongToInt
768
- #define ULongLongToIntPtr ULongLongToLongLong
769
- #define ULongLongToIntPtr ULongLongToInt
770
657
#define ULongLongToUInt32 ULongLongToUInt
771
- #define ULongLongToUIntPtr ULongLongToUInt
772
- #define ULongLongToULongPtr ULongLongToULong
773
- #define ULongLongToDWord ULongLongToULong
774
- #define ULongLongToDWordPtr ULongLongToULongPtr
775
- #define ULongLongToInt64 ULongLongToLongLong
776
658
#define ULongLongToLong64 ULongLongToLongLong
777
- #define ULongLongToPtrdiffT ULongLongToIntPtr
778
- #define ULongLongToSizeT ULongLongToUIntPtr
779
- #define ULongLongToSSIZET ULongLongToLongPtr
780
659
#define ULongLongToSIZET ULongLongToULongPtr
781
660
#define DWordLongToChar ULongLongToChar
782
661
#define DWordLongToInt8 ULongLongToInt8
@@ -904,23 +783,14 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul)
904
783
#define PtrdiffTToUShort IntPtrToUShort
905
784
#define PtrdiffTToUInt16 IntPtrToUShort
906
785
#define PtrdiffTToWord IntPtrToUShort
907
- #define PtrdiffTToInt IntPtrToInt
908
786
#define PtrdiffTToInt32 IntPtrToInt
909
- #define PtrdiffTToUInt IntPtrToUInt
910
787
#define PtrdiffTToUInt32 IntPtrToUInt
911
- #define PtrdiffTToUIntPtr IntPtrToUIntPtr
912
- #define PtrdiffTToLong IntPtrToLong
913
788
#define PtrdiffTToLongPtr IntPtrToLongPtr
914
- #define PtrdiffTToULong IntPtrToULong
915
- #define PtrdiffTToULongPtr IntPtrToULongPtr
916
- #define PtrdiffTToDWord IntPtrToULong
917
- #define PtrdiffTToDWordPtr IntPtrToULongPtr
918
789
#define PtrdiffTToULongLong IntPtrToULongLong
919
790
#define PtrdiffTToDWordLong IntPtrToULongLong
920
791
#define PtrdiffTToULong64 IntPtrToULongLong
921
792
#define PtrdiffTToDWord64 IntPtrToULongLong
922
793
#define PtrdiffTToUInt64 IntPtrToULongLong
923
- #define PtrdiffTToSizeT IntPtrToUIntPtr
924
794
#define PtrdiffTToSIZET IntPtrToULongPtr
925
795
#define SizeTToInt8 UIntPtrToInt8
926
796
#define SizeTToUChar UIntPtrToUChar
@@ -932,20 +802,9 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul)
932
802
#define SizeTToUShort UIntPtrToUShort
933
803
#define SizeTToUInt16 UIntPtrToUShort
934
804
#define SizeTToWord UIntPtrToUShort
935
- #define SizeTToInt UIntPtrToInt
936
805
#define SizeTToInt32 UIntPtrToInt
937
- #define SizeTToIntPtr UIntPtrToIntPtr
938
- #define SizeTToUInt UIntPtrToUInt
939
- #define SizeTToUInt32 UIntPtrToUInt
940
- #define SizeTToLong UIntPtrToLong
941
- #define SizeTToLongPtr UIntPtrToLongPtr
942
- #define SizeTToULong UIntPtrToULong
943
- #define SizeTToDWord UIntPtrToULong
944
806
#define SizeTToLongLong UIntPtrToLongLong
945
807
#define SizeTToLong64 UIntPtrToLongLong
946
- #define SizeTToInt64 UIntPtrToLongLong
947
- #define SizeTToPtrdiffT UIntPtrToIntPtr
948
- #define SizeTToSSIZET UIntPtrToLongPtr
949
808
#define SSIZETToInt8 LongPtrToInt8
950
809
#define SSIZETToUChar LongPtrToUChar
951
810
#define SSIZETToChar LongPtrToChar
@@ -956,23 +815,13 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul)
956
815
#define SSIZETToUShort LongPtrToUShort
957
816
#define SSIZETToUInt16 LongPtrToUShort
958
817
#define SSIZETToWord LongPtrToUShort
959
- #define SSIZETToInt LongPtrToInt
960
818
#define SSIZETToInt32 LongPtrToInt
961
- #define SSIZETToIntPtr LongPtrToIntPtr
962
- #define SSIZETToUInt LongPtrToUInt
963
819
#define SSIZETToUInt32 LongPtrToUInt
964
- #define SSIZETToUIntPtr LongPtrToUIntPtr
965
- #define SSIZETToLong LongPtrToLong
966
- #define SSIZETToULong LongPtrToULong
967
- #define SSIZETToULongPtr LongPtrToULongPtr
968
- #define SSIZETToDWord LongPtrToULong
969
- #define SSIZETToDWordPtr LongPtrToULongPtr
970
820
#define SSIZETToULongLong LongPtrToULongLong
971
821
#define SSIZETToDWordLong LongPtrToULongLong
972
822
#define SSIZETToULong64 LongPtrToULongLong
973
823
#define SSIZETToDWord64 LongPtrToULongLong
974
824
#define SSIZETToUInt64 LongPtrToULongLong
975
- #define SSIZETToSizeT LongPtrToUIntPtr
976
825
#define SSIZETToSIZET LongPtrToULongPtr
977
826
#define SIZETToInt8 ULongPtrToInt8
978
827
#define SIZETToUChar ULongPtrToUChar
@@ -1001,25 +850,19 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul)
1001
850
#define SIZETToSSIZET ULongPtrToLongPtr
1002
851
1003
852
#define UInt16Add UShortAdd
1004
- #define WordAdd UShortAdd
1005
853
#define UInt32Add UIntAdd
1006
- #define DWordAdd ULongAdd
1007
854
#define DWordLongAdd ULongLongAdd
1008
855
#define ULong64Add ULongLongAdd
1009
856
#define DWord64Add ULongLongAdd
1010
857
#define UInt64Add ULongLongAdd
1011
858
#define UInt16Sub UShortSub
1012
- #define WordSub UShortSub
1013
859
#define UInt32Sub UIntSub
1014
- #define DWordSub ULongSub
1015
860
#define DWordLongSub ULongLongSub
1016
861
#define ULong64Sub ULongLongSub
1017
862
#define DWord64Sub ULongLongSub
1018
863
#define UInt64Sub ULongLongSub
1019
864
#define UInt16Mult UShortMult
1020
- #define WordMult UShortMult
1021
865
#define UInt32Mult UIntMult
1022
- #define DWordMult ULongMult
1023
866
#define DWordLongMult ULongLongMult
1024
867
#define ULong64Mult ULongLongMult
1025
868
#define DWord64Mult ULongLongMult
@@ -1040,6 +883,6 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul)
1040
883
#define Long64Mult LongLongMult
1041
884
#define Int64Mult LongLongMult
1042
885
1043
- #endif /* __GNUC__ >= 5 */
886
+ #endif /* __MINGW_INTSAFE_WORKS */
1044
887
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */
1045
888
#endif /* _INTSAFE_H_INCLUDED_ */
0 commit comments