commit f508a7850989b8e02c48f696f28c48d47591803a
author Steven Edwards <steven_ed4153@yahoo.com> Tue Oct 21 23:45:43 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Oct 21 23:45:43 2003 +0000
tree d4af6727c1e0b9313fa634f97630e0b6b1955213
parent c33e4c4723d038918d71bf8734a2946b1141a3d7

- Win16/32 cleanup.
- Fixes for building with the PSDK.

include/setupapi.h

diff --git a/include/setupapi.h b/include/setupapi.h
index 790d346..c1c8420 100644
--- a/include/setupapi.h
+++ b/include/setupapi.h
@@ -155,7 +155,7 @@
 typedef WINELIB_NAME_AW(PSP_DEVICE_INTERFACE_DETAIL_DATA_) PSP_DEVICE_INTERFACE_DETAIL_DATA;
 #endif
 
-typedef struct _FILE_IN_CABINET_INFOA {
+typedef struct _FILE_IN_CABINET_INFO_A {
   LPCSTR NameInCabinet;
   DWORD FileSize;
   DWORD Win32Error;
@@ -163,9 +163,9 @@
   WORD DosTime;
   WORD DosAttribs;
   CHAR FullTargetName[MAX_PATH];
-} FILE_IN_CABINET_INFOA, *PFILE_IN_CABINET_INFOA;
+} FILE_IN_CABINET_INFO_A, *PFILE_IN_CABINET_INFO_A;
 
-typedef struct _FILE_IN_CABINET_INFOW {
+typedef struct _FILE_IN_CABINET_INFO_W {
   LPCWSTR NameInCabinet;
   DWORD FileSize;
   DWORD Win32Error;
@@ -173,26 +173,26 @@
   WORD DosTime;
   WORD DosAttribs;
   WCHAR FullTargetName[MAX_PATH];
-} FILE_IN_CABINET_INFOW, *PFILE_IN_CABINET_INFOW;
+} FILE_IN_CABINET_INFO_W, *PFILE_IN_CABINET_INFO_W;
 
 DECL_WINELIB_TYPE_AW(FILE_IN_CABINET_INFO)
 DECL_WINELIB_TYPE_AW(PFILE_IN_CABINET_INFO)
 
-typedef struct _CABINET_INFOA {
+typedef struct _CABINET_INFO_A {
   PCSTR CabinetPath;
   PCSTR CabinetFile;
   PCSTR DiskName;
   USHORT SetId;
   USHORT CabinetNumber;
-} CABINET_INFOA, *PCABINET_INFOA;
+} CABINET_INFO_A, *PCABINET_INFO_A;
 
-typedef struct _CABINET_INFOW {
+typedef struct _CABINET_INFO_W {
   PCWSTR CabinetPath;
   PCWSTR CabinetFile;
   PCWSTR DiskName;
   USHORT SetId;
   USHORT CabinetNumber;
-} CABINET_INFOW, *PCABINET_INFOW;
+} CABINET_INFO_W, *PCABINET_INFO_W;
 
 DECL_WINELIB_TYPE_AW(CABINET_INFO);
 DECL_WINELIB_TYPE_AW(PCABINET_INFO);