[aaf-commits] AAF/ref-impl/include/com-api AAF_i.c, 1.29, 1.30 AAFPlugin_i.c, 1.9, 1.10 AAFPrivate_i.c, 1.9, 1.10

[Stuart C. <stu...@us...>]

Update of /cvsroot/aaf/AAF/ref-impl/include/com-api
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv5495/ref-impl/include/com-api

Modified Files:
	AAF_i.c AAFPlugin_i.c AAFPrivate_i.c 
Log Message:
To support g++ on WIN32 remove MSVC internal __IID_DEFINED__ guard around IID and CLSID typedefs.


Index: AAF_i.c
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/include/com-api/AAF_i.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** AAF_i.c	2 Feb 2007 19:28:45 -0000	1.29
--- AAF_i.c	12 Apr 2007 13:03:17 -0000	1.30
***************
*** 48,69 ****
  #else // !_MIDL_USE_GUIDDEF_
  
- #ifndef __IID_DEFINED__
- #define __IID_DEFINED__
- 
- typedef struct _IID
- {
-     unsigned long x;
-     unsigned short s1;
-     unsigned short s2;
-     unsigned char  c[8];
- } IID;
- 
- #endif // __IID_DEFINED__
- 
- #ifndef CLSID_DEFINED
- #define CLSID_DEFINED
- typedef IID CLSID;
- #endif // CLSID_DEFINED
- 
  #define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
          const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
--- 48,51 ----
***************
*** 666,687 ****
  #else // !_MIDL_USE_GUIDDEF_
  
- #ifndef __IID_DEFINED__
- #define __IID_DEFINED__
- 
- typedef struct _IID
- {
-     unsigned long x;
-     unsigned short s1;
-     unsigned short s2;
-     unsigned char  c[8];
- } IID;
- 
- #endif // __IID_DEFINED__
- 
- #ifndef CLSID_DEFINED
- #define CLSID_DEFINED
- typedef IID CLSID;
- #endif // CLSID_DEFINED
- 
  #define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
          const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
--- 648,651 ----

Index: AAFPlugin_i.c
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/include/com-api/AAFPlugin_i.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AAFPlugin_i.c	26 Jan 2007 18:45:54 -0000	1.9
--- AAFPlugin_i.c	12 Apr 2007 13:03:18 -0000	1.10
***************
*** 48,69 ****
  #else // !_MIDL_USE_GUIDDEF_
  
- #ifndef __IID_DEFINED__
- #define __IID_DEFINED__
- 
- typedef struct _IID
- {
-     unsigned long x;
-     unsigned short s1;
-     unsigned short s2;
-     unsigned char  c[8];
- } IID;
- 
- #endif // __IID_DEFINED__
- 
- #ifndef CLSID_DEFINED
- #define CLSID_DEFINED
- typedef IID CLSID;
- #endif // CLSID_DEFINED
- 
  #define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
          const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
--- 48,51 ----
***************
*** 156,177 ****
  #else // !_MIDL_USE_GUIDDEF_
  
- #ifndef __IID_DEFINED__
- #define __IID_DEFINED__
- 
- typedef struct _IID
- {
-     unsigned long x;
-     unsigned short s1;
-     unsigned short s2;
-     unsigned char  c[8];
- } IID;
- 
- #endif // __IID_DEFINED__
- 
- #ifndef CLSID_DEFINED
- #define CLSID_DEFINED
- typedef IID CLSID;
- #endif // CLSID_DEFINED
- 
  #define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
          const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
--- 138,141 ----

Index: AAFPrivate_i.c
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/include/com-api/AAFPrivate_i.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AAFPrivate_i.c	17 Jan 2007 04:57:33 -0000	1.9
--- AAFPrivate_i.c	12 Apr 2007 13:03:19 -0000	1.10
***************
*** 48,69 ****
  #else // !_MIDL_USE_GUIDDEF_
  
- #ifndef __IID_DEFINED__
- #define __IID_DEFINED__
- 
- typedef struct _IID
- {
-     unsigned long x;
-     unsigned short s1;
-     unsigned short s2;
-     unsigned char  c[8];
- } IID;
- 
- #endif // __IID_DEFINED__
- 
- #ifndef CLSID_DEFINED
- #define CLSID_DEFINED
- typedef IID CLSID;
- #endif // CLSID_DEFINED
- 
  #define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
          const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
--- 48,51 ----
***************
*** 171,192 ****
  #else // !_MIDL_USE_GUIDDEF_
  
- #ifndef __IID_DEFINED__
- #define __IID_DEFINED__
- 
- typedef struct _IID
- {
-     unsigned long x;
-     unsigned short s1;
-     unsigned short s2;
-     unsigned char  c[8];
- } IID;
- 
- #endif // __IID_DEFINED__
- 
- #ifndef CLSID_DEFINED
- #define CLSID_DEFINED
- typedef IID CLSID;
- #endif // CLSID_DEFINED
- 
  #define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
          const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
--- 153,156 ----