It results in a compilation error with widl 6.0-rc1:
include/bdatypes.h:43: error: 'PBDA_EVENT_ID': [v1_enum] attribute applied to
non-enum type
The code generated without this ifdef is equivalent.
(see MEDIA_SAMPLE_CONTENT for example)
---
mingw-w64-headers/include/bdatypes.h | 107 +--------------------------
1 file changed, 2 insertions(+), 105 deletions(-)
diff --git a/mingw-w64-headers/include/bdatypes.h
b/mingw-w64-headers/include/bdatypes.h
index 8ddc3be0..d743c4c0 100644
--- a/mingw-w64-headers/include/bdatypes.h
+++ b/mingw-w64-headers/include/bdatypes.h
@@ -16,9 +16,6 @@
typedef LONG PBDARESULT;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum BDA_EVENT_ID {
BDA_EVENT_SIGNAL_LOSS = 0,
BDA_EVENT_SIGNAL_LOCK,
@@ -43,9 +40,6 @@ typedef
} BDA_EVENT_ID, *PBDA_EVENT_ID;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum BDA_MULTICAST_MODE {
BDA_PROMISCUOUS_MULTICAST = 0,
BDA_FILTERED_MULTICAST,
@@ -53,9 +47,6 @@ typedef
} BDA_MULTICAST_MODE, *PBDA_MULTICAST_MODE;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum BDA_SIGNAL_STATE {
BDA_SIGNAL_UNAVAILABLE = 0,
BDA_SIGNAL_INACTIVE,
@@ -63,18 +54,12 @@ typedef
} BDA_SIGNAL_STATE, *PBDA_SIGNAL_STATE;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum BDA_CHANGE_STATE {
BDA_CHANGES_COMPLETE = 0,
BDA_CHANGES_PENDING
} BDA_CHANGE_STATE, *PBDA_CHANGE_STATE;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum MEDIA_SAMPLE_CONTENT {
MEDIA_TRANSPORT_PACKET,
MEDIA_ELEMENTARY_STREAM,
@@ -83,18 +68,12 @@ typedef
} MEDIA_SAMPLE_CONTENT;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum ISDBCAS_REQUEST_ID {
ISDBCAS_REQUEST_ID_EMG = 0x38,
ISDBCAS_REQUEST_ID_EMD = 0x3a,
} ISDBCAS_REQUEST_ID;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum MUX_PID_TYPE {
PID_OTHER = -1,
PID_ELEMENTARY_STREAM,
@@ -102,9 +81,6 @@ typedef
} MUX_PID_TYPE;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum DVBSystemType {
DVB_Cable,
DVB_Terrestrial,
@@ -114,17 +90,11 @@ typedef
} DVBSystemType;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum BDA_Channel {
BDA_UNDEFINED_CHANNEL = -1
} BDA_Channel;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum ComponentCategory {
CategoryNotSet = -1,
CategoryOther = 0,
@@ -139,9 +109,6 @@ typedef
} ComponentCategory;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum ComponentStatus {
StatusActive,
StatusInactive,
@@ -149,9 +116,6 @@ typedef
} ComponentStatus;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum MPEG2StreamType {
BDA_UNITIALIZED_MPEG2STREAMTYPE = -1,
Reserved1 = 0x00,
@@ -190,17 +154,11 @@ typedef
} MPEG2StreamType;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum ATSCComponentTypeFlags {
ATSCCT_AC3 = 0x1
} ATSCComponentTypeFlags;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum BinaryConvolutionCodeRate {
BDA_BCC_RATE_NOT_SET = -1,
BDA_BCC_RATE_NOT_DEFINED = 0,
@@ -222,9 +180,7 @@ typedef
} BinaryConvolutionCodeRate;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
+
enum FECMethod {
BDA_FEC_METHOD_NOT_SET = -1,
BDA_FEC_METHOD_NOT_DEFINED = 0,
@@ -237,9 +193,7 @@ typedef
} FECMethod;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
+
enum ModulationType {
BDA_MOD_NOT_SET = -1,
BDA_MOD_NOT_DEFINED = 0,
@@ -282,9 +236,6 @@ typedef
} ModulationType;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum tagScanModulationTypes {
BDA_SCAN_MOD_16QAM = 0x00000001,
BDA_SCAN_MOD_32QAM = 0x00000002,
@@ -326,9 +277,6 @@ typedef
} ScanModulationTypes;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum SpectralInversion {
BDA_SPECTRAL_INVERSION_NOT_SET = -1,
BDA_SPECTRAL_INVERSION_NOT_DEFINED = 0,
@@ -339,9 +287,6 @@ typedef
} SpectralInversion;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum Polarisation {
BDA_POLARISATION_NOT_SET = -1,
BDA_POLARISATION_NOT_DEFINED = 0,
@@ -353,9 +298,6 @@ typedef
} Polarisation;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum LNB_Source {
BDA_LNB_SOURCE_NOT_SET = -1,
BDA_LNB_SOURCE_NOT_DEFINED = 0,
@@ -367,9 +309,6 @@ typedef
} LNB_Source;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum GuardInterval {
BDA_GUARD_NOT_SET = -1,
BDA_GUARD_NOT_DEFINED = 0,
@@ -384,9 +323,6 @@ typedef
} GuardInterval;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum HierarchyAlpha {
BDA_HALPHA_NOT_SET = -1,
BDA_HALPHA_NOT_DEFINED = 0,
@@ -397,9 +333,6 @@ typedef
} HierarchyAlpha;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum TransmissionMode {
BDA_XMIT_MODE_NOT_SET = -1,
BDA_XMIT_MODE_NOT_DEFINED = 0,
@@ -415,9 +348,6 @@ typedef
} TransmissionMode;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum RollOff {
BDA_ROLL_OFF_NOT_SET = -1,
BDA_ROLL_OFF_NOT_DEFINED = 0,
@@ -428,9 +358,6 @@ typedef
} RollOff;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum Pilot {
BDA_PILOT_NOT_SET = -1,
BDA_PILOT_NOT_DEFINED = 0,
@@ -440,45 +367,30 @@ typedef
} Pilot;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum BDA_Frequency {
BDA_FREQUENCY_NOT_SET = -1,
BDA_FREQUENCY_NOT_DEFINED = 0
} BDA_Frequency;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum BDA_Range {
BDA_RANGE_NOT_SET = -1,
BDA_RANGE_NOT_DEFINED = 0
} BDA_Range;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum BDA_Channel_Bandwidth {
BDA_CHAN_BANDWITH_NOT_SET = -1,
BDA_CHAN_BANDWITH_NOT_DEFINED = 0
} BDA_Channel_Bandwidth;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum BDA_Frequency_Multiplier {
BDA_FREQUENCY_MULTIPLIER_NOT_SET = -1,
BDA_FREQUENCY_MULTIPLIER_NOT_DEFINED = 0
} BDA_Frequency_Multiplier;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum BDA_Comp_Flags {
BDACOMP_NOT_DEFINED = 0x00000000,
BDACOMP_EXCLUDE_TS_FROM_TR = 0x00000001,
@@ -487,9 +399,6 @@ typedef
} BDA_Comp_Flags;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum ApplicationTypeType {
SCTE28_ConditionalAccess = 0,
SCTE28_POD_Host_Binding_Information,
@@ -503,9 +412,6 @@ typedef
} ApplicationTypeType;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum BDA_CONDITIONALACCESS_REQUESTTYPE {
CONDITIONALACCESS_ACCESS_UNSPECIFIED = 0,
CONDITIONALACCESS_ACCESS_NOT_POSSIBLE,
@@ -514,9 +420,6 @@ typedef
} BDA_CONDITIONALACCESS_REQUESTTYPE;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum BDA_CONDITIONALACCESS_MMICLOSEREASON {
CONDITIONALACCESS_UNSPECIFIED = 0,
CONDITIONALACCESS_CLOSED_ITSELF,
@@ -528,9 +431,6 @@ typedef
} BDA_CONDITIONALACCESS_MMICLOSEREASON;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum BDA_CONDITIONALACCESS_SESSION_RESULT {
CONDITIONALACCESS_SUCCESSFULL = 0,
CONDITIONALACCESS_ENDED_NOCHANGE,
@@ -538,9 +438,6 @@ typedef
} BDA_CONDITIONALACCESS_SESSION_RESULT;
typedef
-#ifdef __WIDL__
- [v1_enum]
-#endif
enum BDA_DISCOVERY_STATE {
BDA_DISCOVERY_UNSPECIFIED = 0,
BDA_DISCOVERY_REQUIRED,
--
2.29.2
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
