Changeset 3318 for trunk/include

Timestamp:

Apr 5, 2000, 4:17:01 PM (25 years ago)

Author:

sandervl

Message:

nameless union fixes

Location:

trunk/include/win

Files:

• mmsystem.h (modified) (2 diffs)
• windef.h (modified) (2 diffs)

trunk/include/win/mmsystem.h

@@ -1 @@
-/* $Id: mmsystem.h,v 1.6 2000-02-03 13:26:22 sandervl Exp $ */
+/* $Id: mmsystem.h,v 1.7 2000-04-05 14:17:00 sandervl Exp $ */
 /* 
  * MMSYSTEM - Multimedia Wine Extension ... :-)
@@ -16 +16 @@
    
 #include "pshpack1.h"
+
+//#ifndef NONAMELESSSTRUCT
+//#define DUMMYSTRUCTNAME
+//#define DUMMYSTRUCTNAME1
+//#define DUMMYSTRUCTNAME2
+//#define DUMMYSTRUCTNAME3
+//#define DUMMYSTRUCTNAME4
+//#define DUMMYSTRUCTNAME5
+//#else /* !defined(NONAMELESSSTRUCT) */
+#define DUMMYSTRUCTNAME   s
+#define DUMMYSTRUCTNAME1  s1
+#define DUMMYSTRUCTNAME2  s2
+#define DUMMYSTRUCTNAME3  s3
+#define DUMMYSTRUCTNAME4  s4
+#define DUMMYSTRUCTNAME5  s5
+#undef DUMMYUNIONNAME
+#undef DUMMYUNIONNAME1
+#undef DUMMYUNIONNAME2
+#undef DUMMYUNIONNAME3
+#undef DUMMYUNIONNAME4
+#undef DUMMYUNIONNAME5
+#define DUMMYUNIONNAME   u
+#define DUMMYUNIONNAME1  u1
+#define DUMMYUNIONNAME2  u2
+#define DUMMYUNIONNAME3  u3
+#define DUMMYUNIONNAME4  u4
+#define DUMMYUNIONNAME5  u5
+
+//#endif /* !defined(NONAMELESSSTRUCT) */
    
 #define MAXWAVEDRIVERS  10

trunk/include/win/windef.h

@@ -1 @@
-/* $Id: windef.h,v 1.22 2000-04-02 14:51:42 sandervl Exp $ */
+/* $Id: windef.h,v 1.23 2000-04-05 14:17:01 sandervl Exp $ */
 
 /*
@@ -665 +665 @@
 } DECIMAL;
 
-#ifndef NONAMELESSSTRUCT
-# if defined(__WINE__) || !defined(_FORCENAMELESSSTRUCT)
-#  define NONAMELESSSTRUCT
-# endif
-#endif /* !defined(NONAMELESSSTRUCT) */
-
-#ifndef NONAMELESSUNION
-# if defined(__WINE__) || !defined(_FORCENAMELESSUNION) || !defined(__cplusplus)
-#  define NONAMELESSUNION
-# endif
-#endif /* !defined(NONAMELESSUNION) */
-
-#ifndef NONAMELESSSTRUCT
-#define DUMMYSTRUCTNAME
-#define DUMMYSTRUCTNAME1
-#define DUMMYSTRUCTNAME2
-#define DUMMYSTRUCTNAME3
-#define DUMMYSTRUCTNAME4
-#define DUMMYSTRUCTNAME5
-#else /* !defined(NONAMELESSSTRUCT) */
-#define DUMMYSTRUCTNAME   s
-#define DUMMYSTRUCTNAME1  s1
-#define DUMMYSTRUCTNAME2  s2
-#define DUMMYSTRUCTNAME3  s3
-#define DUMMYSTRUCTNAME4  s4
-#define DUMMYSTRUCTNAME5  s5
-#endif /* !defined(NONAMELESSSTRUCT) */
-
-#ifndef NONAMELESSUNION
-#define DUMMYUNIONNAME
-#define DUMMYUNIONNAME1
-#define DUMMYUNIONNAME2
-#define DUMMYUNIONNAME3
-#define DUMMYUNIONNAME4
-#define DUMMYUNIONNAME5
-#else /* !defined(NONAMELESSUNION) */
-#define DUMMYUNIONNAME   u
-#define DUMMYUNIONNAME1  u1
-#define DUMMYUNIONNAME2  u2
-#define DUMMYUNIONNAME3  u3
-#define DUMMYUNIONNAME4  u4
-#define DUMMYUNIONNAME5  u5
-#endif /* !defined(NONAMELESSUNION) */
-
 #ifdef __cplusplus
 }