From 7e577b86908769e106eded9a16e9fb2910b6aa0c Mon Sep 17 00:00:00 2001 From: Christophe Cornu Date: Mon, 19 Aug 2002 15:05:43 +0000 Subject: PR22443 - removed field filler --- .../win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java | 1 - .../win32/org/eclipse/swt/internal/ole/win32/FUNCDESC1.java | 2 -- .../win32/org/eclipse/swt/internal/ole/win32/FUNCDESC2.java | 2 -- .../win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java | 2 -- .../win32/org/eclipse/swt/internal/ole/win32/VARDESC1.java | 3 --- .../win32/org/eclipse/swt/internal/ole/win32/VARDESC2.java | 3 --- 6 files changed, 13 deletions(-) (limited to 'bundles/org.eclipse.swt') diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java index adc449676c..08e67f74e9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java @@ -11,7 +11,6 @@ public final class CONTROLINFO public int cb; public int hAccel; public short cAccel; - public short filler; public int dwFlags; public static final int sizeof = 16; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC1.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC1.java index c89449cd38..341c6891b2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC1.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC1.java @@ -22,11 +22,9 @@ public class FUNCDESC1 { //TYPEDESC elemdescFunc.tdesc public int elemdescFunc_tdesc_union; public short elemdescFunc_tdesc_vt; - public short elemdescFunc_tdesc_filler; //PARAMDESC elemdescFunc.paramdesc public int elemdescFunc_paramdesc_pparamdescex; public short elemdescFunc_paramdesc_wParamFlags; - public short elemdescFunc_paramdesc_filler; public short wFuncFlags; public static final int sizeof = 50; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC2.java index 147587c4c1..52feffc604 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC2.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC2.java @@ -22,11 +22,9 @@ public class FUNCDESC2 { //TYPEDESC elemdescFunc.tdesc public int elemdescFunc_tdesc_union; public short elemdescFunc_tdesc_vt; - public short elemdescFunc_tdesc_filler; //IDLDESC elemdescFunc.idldesc public int elemdescFunc_idldesc_dwReserved; public short elemdescFunc_idldesc_wIDLFlags; - public short elemdescFunc_idldesc_filler; public short wFuncFlags; public static final int sizeof = 50; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java index cebfbcbf35..e145806e66 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java @@ -40,8 +40,6 @@ public final class TYPEATTR // public TYPEDESC tdescAlias public int tdescAlias_unionField; public short tdescAlias_vt; - // this filler field is required for proper byte alignment - public short filler; // public IDLDESC idldesctype public int idldescType_dwReserved; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC1.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC1.java index 30bddcc4a9..ac9ca544ba 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC1.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC1.java @@ -15,13 +15,10 @@ public class VARDESC1 { //TYPEDESC elemdescVar.tdesc public int elemdescVar_tdesc_union; public short elemdescVar_tdesc_vt; - public short elemdescVar_tdesc_filler; //PARAMDESC elemdescFunc.paramdesc public int elemdescVar_paramdesc_pparamdescex; public short elemdescVar_paramdesc_wParamFlags; - public short elemdescVar_paramdesc_filler; public short wVarFlags; - public short filler; public int varkind; public static final int sizeof = 36; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC2.java index 148a6441f6..2772001750 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC2.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC2.java @@ -15,13 +15,10 @@ public class VARDESC2 { //TYPEDESC elemdescVar.tdesc public int elemdescVar_tdesc_union; public short elemdescVar_tdesc_vt; - public short elemdescVar_tdesc_filler; //IDLDESC elemdescFunc.idldesc public int elemdescFunc_idldesc_dwReserved; public short elemdescFunc_idldesc_wIDLFlags; - public short elemdescFunc_idldesc_filler; public short wVarFlags; - public short filler; public int varkind; public static final int sizeof = 36; -- cgit