commit 99acd7dfa3ea77c5707191ca4d9383169b47f027
author Francois Gouget <fgouget@free.fr> Sun Dec 03 03:16:05 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Dec 03 03:16:05 2000 +0000
tree 655475838be49458daab5a926b560bc6dae33f71
parent e4d09327ef223ff190a589a13e93025386f17a7b

Use the DUMMYUNIONNAME macros so that the headers can be used in
Winelib.

include/dplay.h

diff --git a/include/dplay.h b/include/dplay.h
index 86b98da..1d409aa 100644
--- a/include/dplay.h
+++ b/include/dplay.h
@@ -1,12 +1,6 @@
 #ifndef __WINE_DPLAY_H
 #define __WINE_DPLAY_H
 
-/* FIXME: GCC doesn't yet support annon structures so some of the structures 
- * defined here don't match the sdk exactly. I've tried to come up with 
- * suitably terse names, but this file won't cut it for inclusion into a 
- * Winelib app.
- */
-
 #include "wine/obj_base.h"
 
 #ifdef __cplusplus
@@ -182,13 +176,13 @@
     {                           
         LPWSTR  lpszShortName;  
         LPSTR   lpszShortNameA; 
-    }psn;
+    } DUMMYUNIONNAME1;
 
     union /*playerLongName */       /* Player's formal/real name */
     {                         
         LPWSTR  lpszLongName;  
         LPSTR   lpszLongNameA;  
-    }pln;
+    } DUMMYUNIONNAME2;
 
 } DPNAME, *LPDPNAME;
 
@@ -232,13 +226,13 @@
     {                             
         LPWSTR  lpszSessionName;  
         LPSTR   lpszSessionNameA; 
-    }sess;
+    } DUMMYUNIONNAME1;
 
     union  /* Optional password */
     {                           
         LPWSTR  lpszPassword;   
         LPSTR   lpszPasswordA;  
-    }pass;
+    } DUMMYUNIONNAME2;
 
     DWORD   dwReserved1;       
     DWORD   dwReserved2;
@@ -289,7 +283,7 @@
     {                          /* Message string */
         LPWSTR  lpszMessage;   /* Unicode */
         LPSTR   lpszMessageA;  /* ANSI */
-    }msgstr;
+    } DUMMYUNIONNAME;
 } DPCHAT, *LPDPCHAT;
 
 typedef struct
@@ -307,12 +301,12 @@
     {                               /* SSPI provider name */
         LPWSTR  lpszSSPIProvider;   /* Unicode */
         LPSTR   lpszSSPIProviderA;  /* ANSI */
-    }sspi;
+    } DUMMYUNIONNAME1;
     union
     {                               /* CAPI provider name */
         LPWSTR lpszCAPIProvider;    /* Unicode */
         LPSTR  lpszCAPIProviderA;   /* ANSI */
-    }capi;
+    } DUMMYUNIONNAME2;
     DWORD dwCAPIProviderType;       /* Crypto Service Provider type */
     DWORD dwEncryptionAlgorithm;    /* Encryption Algorithm type */
 } DPSECURITYDESC, *LPDPSECURITYDESC;
@@ -327,17 +321,17 @@
     {                           /* User name of the account */
         LPWSTR  lpszUsername;   /* Unicode */
         LPSTR   lpszUsernameA;  /* ANSI */
-    }name;
+    } DUMMYUNIONNAME1;
     union
     {                           /* Password of the account */
         LPWSTR  lpszPassword;   /* Unicode */
         LPSTR   lpszPasswordA;  /* ANSI */
-    }pass;
+    } DUMMYUNIONNAME2;
     union
     {                           /* Domain name of the account */
         LPWSTR  lpszDomain;     /* Unicode */
         LPSTR   lpszDomainA;    /* ANSI */
-    }domain;
+    } DUMMYUNIONNAME3;
 } DPCREDENTIALS, *LPDPCREDENTIALS;
 
 typedef const DPCREDENTIALS *LPCDPCREDENTIALS;