diff options
Diffstat (limited to 'winsup/w32api/include/oledlg.h')
-rw-r--r-- | winsup/w32api/include/oledlg.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/winsup/w32api/include/oledlg.h b/winsup/w32api/include/oledlg.h index 11dd88b9f..27ed2adbe 100644 --- a/winsup/w32api/include/oledlg.h +++ b/winsup/w32api/include/oledlg.h @@ -417,7 +417,6 @@ typedef struct tagOLEUIPASTESPECIALA { HGLOBAL hMetaPict; SIZEL sizel; } OLEUIPASTESPECIALA,*POLEUIPASTESPECIALA,*LPOLEUIPASTESPECIALA; -#undef INTERFACE #define INTERFACE IOleUILinkContainerW DECLARE_INTERFACE_(IOleUILinkContainerW, IUnknown) { @@ -433,8 +432,8 @@ DECLARE_INTERFACE_(IOleUILinkContainerW, IUnknown) STDMETHOD(UpdateLink) (THIS_ DWORD,BOOL,BOOL) PURE; STDMETHOD(CancelLink) (THIS_ DWORD) PURE; }; -typedef IOleUILinkContainerW *LPOLEUILINKCONTAINERW; #undef INTERFACE +typedef IOleUILinkContainerW *LPOLEUILINKCONTAINERW; #define INTERFACE IOleUILinkContainerA DECLARE_INTERFACE_(IOleUILinkContainerA, IUnknown) { @@ -450,6 +449,7 @@ DECLARE_INTERFACE_(IOleUILinkContainerA, IUnknown) STDMETHOD(UpdateLink) (THIS_ DWORD,BOOL,BOOL) PURE; STDMETHOD(CancelLink) (THIS_ DWORD) PURE; }; +#undef INTERFACE typedef IOleUILinkContainerA *LPOLEUILINKCONTAINERA; typedef struct tagOLEUIEDITLINKSW { DWORD cbStruct; @@ -617,7 +617,6 @@ typedef struct tagOLEUICHANGESOURCEA { LPSTR lpszFrom; LPSTR lpszTo; } OLEUICHANGESOURCEA,*POLEUICHANGESOURCEA,*LPOLEUICHANGESOURCEA; -#undef INTERFACE #define INTERFACE IOleUIObjInfoW DECLARE_INTERFACE_(IOleUIObjInfoW, IUnknown) { @@ -630,8 +629,8 @@ DECLARE_INTERFACE_(IOleUIObjInfoW, IUnknown) STDMETHOD(GetViewInfo)(THIS_ DWORD,HGLOBAL*,PDWORD,int*) PURE; STDMETHOD(SetViewInfo)(THIS_ DWORD,HGLOBAL,DWORD,int,BOOL) PURE; }; -typedef IOleUIObjInfoW *LPOLEUIOBJINFOW; #undef INTERFACE +typedef IOleUIObjInfoW *LPOLEUIOBJINFOW; #define INTERFACE IOleUIObjInfoA DECLARE_INTERFACE_(IOleUIObjInfoA, IUnknown) { @@ -644,8 +643,8 @@ DECLARE_INTERFACE_(IOleUIObjInfoA, IUnknown) STDMETHOD(GetViewInfo)(THIS_ DWORD,HGLOBAL*,PDWORD,int*) PURE; STDMETHOD(SetViewInfo)(THIS_ DWORD,HGLOBAL,DWORD,int,BOOL) PURE; }; -typedef IOleUIObjInfoA *LPOLEUIOBJINFOA; #undef INTERFACE +typedef IOleUIObjInfoA *LPOLEUIOBJINFOA; #define INTERFACE IOleUILinkInfoW DECLARE_INTERFACE_(IOleUILinkInfoW, IOleUILinkContainerW) { @@ -662,8 +661,8 @@ DECLARE_INTERFACE_(IOleUILinkInfoW, IOleUILinkContainerW) STDMETHOD(CancelLink)(THIS_ DWORD) PURE; STDMETHOD(GetLastUpdate)(THIS_ DWORD,FILETIME*) PURE; }; -typedef IOleUILinkInfoW *LPOLEUILINKINFOW; #undef INTERFACE +typedef IOleUILinkInfoW *LPOLEUILINKINFOW; #define INTERFACE IOleUILinkInfoA DECLARE_INTERFACE_(IOleUILinkInfoA, IOleUILinkContainerA) { @@ -680,6 +679,7 @@ DECLARE_INTERFACE_(IOleUILinkInfoA, IOleUILinkContainerA) STDMETHOD(CancelLink)(THIS_ DWORD) PURE; STDMETHOD(GetLastUpdate)(THIS_ DWORD,FILETIME*) PURE; }; +#undef INTERFACE typedef IOleUILinkInfoA* LPOLEUILINKINFOA; struct tagOLEUIOBJECTPROPSW; struct tagOLEUIOBJECTPROPSA; |