Commit in reactos/include/wine on MAIN
guiddef.h+5-31.2 -> 1.3
Rollback last change since it's causing problems on Linux

reactos/include/wine
guiddef.h 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- guiddef.h	23 Dec 2004 08:55:00 -0000	1.2
+++ guiddef.h	23 Dec 2004 12:05:40 -0000	1.3
@@ -16,9 +16,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <basetyps.h>
-#include <objbase.h>
-
 #ifndef GUID_DEFINED
 #define GUID_DEFINED
 typedef struct _GUID
@@ -41,6 +38,9 @@
     extern const GUID name;
 #endif
 
+#define DEFINE_OLEGUID(name, l, w1, w2) \
+	DEFINE_GUID(name, l, w1, w2, 0xC0,0,0,0,0,0,0,0x46)
+
 #ifndef _GUIDDEF_H_
 #define _GUIDDEF_H_
 
@@ -68,6 +68,8 @@
 #else /* defined(__cplusplus) && !defined(CINTERFACE) */
 #define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID)))
 #endif /* defined(__cplusplus) && !defined(CINTERFACE) */
+#define IsEqualIID(riid1, riid2) IsEqualGUID(riid1, riid2)
+#define IsEqualCLSID(rclsid1, rclsid2) IsEqualGUID(rclsid1, rclsid2)
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
 #include <string.h>
CVSspam 0.2.8