Rollback last change since it's causing problems on Linux

svn path=/trunk/; revision=12300
This commit is contained in:
Gé van Geldorp
2004-12-23 12:05:40 +00:00
parent 80fe6c33b9
commit 0b8f1f6126
+5 -3
View File
@@ -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 @@ typedef struct _GUID
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 @@ typedef GUID FMTID,*LPFMTID;
#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>